chore(format): format after isort

uc-cdis · Nov 3, 2023 · 842705b · 842705b
1 parent d551592
commit 842705b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/clean.sh b/clean.sh
@@ -2,19 +2,19 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-echo ----------------------------------------------
-echo Running black to automatically format Python
-echo ----------------------------------------------
-echo    Command: black "$SCRIPT_DIR" --config ~/.gen3/.github/.github/linters/.python-black
-black "$SCRIPT_DIR" --config ~/.gen3/.github/.github/linters/.python-black
-echo
 echo ----------------------------------------------
 echo Running isort to automatically sort imports
 echo ----------------------------------------------
 echo    Command: isort "$SCRIPT_DIR" --settings ~/.gen3/.github/.github/linters
 isort "$SCRIPT_DIR" --settings ~/.gen3/.github/.github/linters
 echo
 echo ----------------------------------------------
+echo Running black to automatically format Python
+echo ----------------------------------------------
+echo    Command: black "$SCRIPT_DIR" --config ~/.gen3/.github/.github/linters/.python-black
+black "$SCRIPT_DIR" --config ~/.gen3/.github/.github/linters/.python-black
+echo
+echo ----------------------------------------------
 echo Running pylint to detect lint
 echo ----------------------------------------------
 echo    Command: pylint -vv "$SCRIPT_DIR/gen3discoveryai" --rcfile ~/.gen3/.github/linters/.python-lint

diff --git a/gen3discoveryai/topic_chains/__init__.py b/gen3discoveryai/topic_chains/__init__.py
@@ -1,4 +1,8 @@
-from gen3discoveryai.topic_chains.question_answer_google import TopicChainGoogleQuestionAnswerRAG
-from gen3discoveryai.topic_chains.question_answer_openai import TopicChainQuestionAnswerRAG
+from gen3discoveryai.topic_chains.question_answer_google import (
+    TopicChainGoogleQuestionAnswerRAG,
+)
+from gen3discoveryai.topic_chains.question_answer_openai import (
+    TopicChainQuestionAnswerRAG,
+)
 
 # ... add more here
diff --git a/pyproject.toml b/pyproject.toml
@@ -76,7 +76,7 @@ addopts = """
 [tool.isort]
 known_first_party = ["gen3discoveryai"]
 profile = "black"
-line_length = 120
+line_length = 88
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/tests/test_qa_topic_chain_google.py b/tests/test_qa_topic_chain_google.py
@@ -3,7 +3,9 @@
 import chromadb
 import pytest
 
-from gen3discoveryai.topic_chains.question_answer_google import TopicChainGoogleQuestionAnswerRAG
+from gen3discoveryai.topic_chains.question_answer_google import (
+    TopicChainGoogleQuestionAnswerRAG,
+)
 
 
 @patch("gen3discoveryai.topic_chains.question_answer_google.RetrievalQA")

diff --git a/tests/test_qa_topic_chain_openai.py b/tests/test_qa_topic_chain_openai.py
@@ -3,7 +3,9 @@
 import chromadb
 import pytest
 
-from gen3discoveryai.topic_chains.question_answer_openai import TopicChainQuestionAnswerRAG
+from gen3discoveryai.topic_chains.question_answer_openai import (
+    TopicChainQuestionAnswerRAG,
+)
 
 
 def test_qa_topic_chain_openai_init_defaults():