Merge branch 'main' into fix-try-except-json

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v5.0.0
     hooks:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.1
+    rev: v0.8.0
     hooks:
+    -   id: ruff
     -   id: ruff-format

agent_gateway/agents/agent.py

@@ -21,7 +21,7 @@
 
 import yaml
 from chains.llm_chain import LLMChain
-from langchain.agents.agent import AgentOutputParser, BaseSingleActionAgent
+from langchain.agents.agent import BaseSingleActionAgent
 from langchain.agents.agent_types import AgentType
 from langchain.callbacks.base import BaseCallbackManager
 from langchain.callbacks.manager import Callbacks
@@ -130,7 +130,7 @@ def plan(
             full_inputs = self.get_full_inputs(intermediate_steps, **kwargs)
             full_output = self.llm_chain.predict(callbacks=callbacks, **full_inputs)
             return self.output_parser.parse(full_output)
-        except Exception as e:
+        except Exception:
             full_inputs["agent_scratchpad"] = (
                 full_inputs["agent_scratchpad"] + full_output + "\nAction: "
             )
@@ -161,7 +161,7 @@ async def aplan(
                 callbacks=callbacks, **full_inputs
             )
             agent_output = await self.output_parser.aparse(full_output)
-        except Exception as e:
+        except Exception:
             full_inputs["agent_scratchpad"] = (
                 full_inputs["agent_scratchpad"] + full_output + "\nAction: "
             )

agent_gateway/chains/llm_chain.py

@@ -133,7 +133,7 @@ def generate(
                     callbacks=run_manager.get_child() if run_manager else None,
                     **self.llm_kwargs,
                 )
-            except:
+            except Exception:
                 text = prompts[0].text
                 # Try removing in-context examples
                 first_index = text.find("Question:")
@@ -167,7 +167,7 @@ async def agenerate(
                     callbacks=run_manager.get_child() if run_manager else None,
                     **self.llm_kwargs,
                 )
-            except:
+            except Exception:
                 text = prompts[0].text
                 # Try removing in-context examples
                 first_index = text.find("Question:")

agent_gateway/executors/agent_executor.py

@@ -30,7 +30,6 @@
 )
 from langchain.pydantic_v1 import root_validator
 from langchain.schema import AgentAction, AgentFinish, OutputParserException
-from langchain.tools import BaseTool
 from langchain.utilities.asyncio import asyncio_timeout
 from langchain.utils.input import get_color_mapping
 

agent_gateway/gateway/gateway.py

@@ -69,7 +69,7 @@ async def arun(self, prompt: str) -> str:
         try:
             snowflake_response = self._parse_snowflake_response(response_text)
             return snowflake_response
-        except:
+        except Exception:
             raise AgentGatewayError(
                 message=f"Failed Cortex LLM Request. Unable to parse response. See details:{response_text}"
             )

agent_gateway/gateway/output_parser.py

@@ -188,7 +188,7 @@ def instantiate_task(
     args = _parse_llm_compiler_action_args(args)
     if tool_name == "fuse":
         # fuse does not have a tool
-        tool_func = lambda x: None
+        tool_func = lambda x: None  # noqa: E731
         stringify_rule = None
     else:
         tool = _find_tool(tool_name, tools)

agent_gateway/gateway/planner.py

@@ -259,7 +259,7 @@ async def run_llm(
         try:
             snowflake_response = self._parse_snowflake_response(response_text)
             return snowflake_response
-        except:
+        except Exception:
             raise AgentGatewayError(
                 message=f"Failed Cortex LLM Request. Unable to parse response. See details:{response_text}"
             )

agent_gateway/tools/utils.py

@@ -40,7 +40,7 @@ class Headers(TypedDict):
 
 def _determine_runtime():
     try:
-        from _stored_proc_restful import StoredProcRestful
+        from _stored_proc_restful import StoredProcRestful  # noqa: F401
 
         return True
     except ImportError:

demo_app/demo_app.py

@@ -13,6 +13,7 @@
 import asyncio
 import io
 import json
+import logging
 import os
 import queue
 import re
@@ -114,8 +115,6 @@ def create_prompt(prompt_key: str):
 
 source_list = []
 
-import logging
-
 
 class StreamlitLogHandler(logging.Handler):
     def __init__(self):