Skip to content

CI Fixes #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luarss merged 1 commit into from
Nov 20, 2024
Merged

CI Fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions backend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
init:
@python3 -m venv .venv && \
. .venv/bin/activate && \
pip install -r requirements.txt
pip install -r requirements.txt && \
pip install -e .

init-dev: init
@. .venv/bin/activate && \
pip install -r requirements-test.txt

format:
@. .venv/bin/activate && \
ruff format && \
mypy .
ruff format

check:
@. .venv/bin/activate && \
ruff check --fix
mypy . && \
ruff check
Empty file removed backend/__init__.py
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ classifiers = [
dependencies = { file = ["requirements.txt"] }
optional-dependencies = { test = { file = ["requirements-test.txt"] } }

[tool.setuptools.packages.find]
where = ["./"]

[tool.mypy]
python_version = "3.12"
warn_unused_configs = true
Expand Down
16 changes: 8 additions & 8 deletions backend/src/agents/retriever_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __init__(

self.tool_descriptions = ""
for tool in self.tools:
text_desc = render_text_description([tool]) # type: ignore
text_desc = render_text_description([tool])
text_desc.replace("(query: str) -> Tuple[str, list[str], list[str]]", " ")
self.tool_descriptions += text_desc + "\n\n"

Expand Down Expand Up @@ -196,20 +196,20 @@ def route(self, state: AgentState) -> list[str]:
return ["retrieve_general"]

if self.inbuit_tool_calling:
tool_names = [tool["name"] for tool in tools if "name" in tool] # type: ignore
tool_names = [tool["name"] for tool in tools if "name" in tool] # type: ignore
return tool_names
else:
return tools

def initialize(self) -> None:
workflow = StateGraph(AgentState)

commands = ToolNode(self.retriever_tools.retrieve_cmds) # type: ignore
install = ToolNode(self.retriever_tools.retrieve_install) # type: ignore
general = ToolNode(self.retriever_tools.retrieve_general) # type: ignore
klayout_docs = ToolNode(self.retriever_tools.retrieve_klayout_docs) # type: ignore
errinfo = ToolNode(self.retriever_tools.retrieve_errinfo) # type: ignore
yosys_rtdocs = ToolNode(self.retriever_tools.retrieve_yosys_rtdocs) # type: ignore
commands = ToolNode(self.retriever_tools.retrieve_cmds)
install = ToolNode(self.retriever_tools.retrieve_install)
general = ToolNode(self.retriever_tools.retrieve_general)
klayout_docs = ToolNode(self.retriever_tools.retrieve_klayout_docs)
errinfo = ToolNode(self.retriever_tools.retrieve_errinfo)
yosys_rtdocs = ToolNode(self.retriever_tools.retrieve_yosys_rtdocs)

workflow.add_node("agent", self.agent)
workflow.add_node("generate", self.generate)
Expand Down
2 changes: 1 addition & 1 deletion backend/src/api/routers/chains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

elif os.getenv("LLM_MODEL") == "gemini":
if os.getenv("GOOGLE_GEMINI") == "1_pro":
llm = ChatGoogleGenerativeAI(model="gemini-pro", temperature=llm_temp) # type: ignore
llm = ChatGoogleGenerativeAI(model="gemini-pro", temperature=llm_temp)
elif os.getenv("GOOGLE_GEMINI") == "1.5_flash":
llm = ChatVertexAI(model_name="gemini-1.5-flash", temperature=llm_temp)
elif os.getenv("GOOGLE_GEMINI") == "1.5_pro":
Expand Down
2 changes: 1 addition & 1 deletion backend/src/api/routers/graphs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

elif os.getenv("LLM_MODEL") == "gemini":
if os.getenv("GOOGLE_GEMINI") == "1_pro":
llm = ChatGoogleGenerativeAI(model="gemini-pro", temperature=llm_temp) # type: ignore
llm = ChatGoogleGenerativeAI(model="gemini-pro", temperature=llm_temp)
elif os.getenv("GOOGLE_GEMINI") == "1.5_flash":
llm = ChatVertexAI(model_name="gemini-1.5-flash", temperature=llm_temp)
elif os.getenv("GOOGLE_GEMINI") == "1.5_pro":
Expand Down
2 changes: 1 addition & 1 deletion backend/src/tools/format_docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def format_docs(docs: list[Document]) -> tuple[str, list[str], list[str]]:

if "url" in doc.metadata:
doc_urls.append(doc.metadata["url"])

doc_output = "\n\n -------------------------- \n\n".join(doc_texts)

return doc_output, doc_srcs, doc_urls
6 changes: 3 additions & 3 deletions evaluation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ init-dev: init

format:
@. .venv/bin/activate && \
ruff format && \
mypy .
ruff format

check:
@. .venv/bin/activate && \
ruff check --fix
mypy . && \
ruff check

clean:
@rm -f llm_tests_output.txt
Expand Down
6 changes: 3 additions & 3 deletions frontend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ init-dev: init

format:
@. .venv/bin/activate && \
ruff format && \
mypy .
ruff format

check:
@. .venv/bin/activate && \
ruff check --fix
mypy . && \
ruff check