Remove extra noqa:E501 and split long strings

Split long error messages and test strings across multiple lines to improve readability and remove unnecessary noqa: E501 comments. Also reformatted SQL condition string construction in oraclevs.py for better clarity.

Author: paxiaatucsdedu

libs/oci/langchain_oci/chat_models/oci_generative_ai.py

@@ -534,7 +534,8 @@ def process_tool_choice(
         """Cohere does not support tool choices."""
         if tool_choice is not None:
             raise ValueError(
-                "Tool choice is not supported for Cohere models.Please remove the tool_choice parameter."  # noqa: E501
+                "Tool choice is not supported for Cohere models."
+                "Please remove the tool_choice parameter."
             )
         return None
 
@@ -998,7 +999,8 @@ def process_tool_choice(
             # For Meta, we use ToolChoiceAuto for tool selection
             return self.oci_tool_choice_auto()
         raise ValueError(
-            f"Unrecognized tool_choice type. Expected str, bool or dict. Received: {tool_choice}"  # noqa: E501
+            f"Unrecognized tool_choice type. Expected str, bool or dict. "
+            f"Received: {tool_choice}"
         )
 
     def process_stream_tool_calls(
@@ -1151,7 +1153,8 @@ def _prepare_request(
 
         except ImportError as ex:
             raise ModuleNotFoundError(
-                "Could not import oci python package. Please make sure you have the oci package installed."  # noqa: E501
+                "Could not import oci python package. "
+                "Please make sure you have the oci package installed."
             ) from ex
 
         oci_params = self._provider.messages_to_oci_params(

libs/oci/langchain_oci/embeddings/oci_data_science_model_deployment_endpoint.py

@@ -72,7 +72,8 @@ def validate_environment(  # pylint: disable=no-self-argument
 
         except ImportError as ex:
             raise ImportError(
-                "Could not import ads python package. Please install it with `pip install oracle_ads`."  # noqa: E501
+                "Could not import ads python package. "
+                "Please install it with `pip install oracle_ads`."
             ) from ex
         if not values.get("auth", None):
             values["auth"] = ads.common.auth.default_signer()

libs/oci/langchain_oci/embeddings/oci_generative_ai.py

@@ -159,7 +159,8 @@ def make_security_token_signer(oci_config):  # type: ignore[no-untyped-def]
 
         except ImportError as ex:
             raise ImportError(
-                "Could not import oci python package. Please make sure you have the oci package installed."  # noqa: E501
+                "Could not import oci python package. "
+                "Please make sure you have the oci package installed."
             ) from ex
         except Exception as e:
             raise ValueError(

libs/oci/langchain_oci/llms/oci_data_science_model_deployment_endpoint.py

@@ -97,7 +97,8 @@ def validate_environment(cls, values: Dict) -> Dict:
 
         except ImportError as ex:
             raise ImportError(
-                "Could not import ads python package. Please install it with `pip install oracle_ads`."  # noqa: E501
+                "Could not import ads python package. "
+                "Please install it with `pip install oracle_ads`."
             ) from ex
 
         if not values.get("auth", None):

libs/oci/langchain_oci/llms/oci_generative_ai.py

@@ -178,7 +178,8 @@ def make_security_token_signer(oci_config):  # type: ignore[no-untyped-def]
                 )
             else:
                 raise ValueError(
-                    f"Please provide valid value to auth_type, {values['auth_type']} is not valid."  # noqa: E501
+                    "Please provide valid value to auth_type, "
+                    f"{values['auth_type']} is not valid."
                 )
 
             values["client"] = oci.generative_ai_inference.GenerativeAiInferenceClient(
@@ -187,7 +188,8 @@ def make_security_token_signer(oci_config):  # type: ignore[no-untyped-def]
 
         except ImportError as ex:
             raise ModuleNotFoundError(
-                "Could not import oci python package. Please make sure you have the oci package installed."  # noqa: E501
+                "Could not import oci python package. "
+                "Please make sure you have the oci package installed."
             ) from ex
         except Exception as e:
             raise ValueError(

libs/oci/tests/integration_tests/chat_models/test_tool_calling.py

@@ -147,7 +147,10 @@ def test_tool_calling_no_infinite_loop(model_id: str, weather_tool: StructuredTo
     agent = create_agent(model_id, weather_tool)
 
     # Invoke the agent
-    system_msg = "You are a helpful assistant. Use the available tools when needed to answer questions accurately."  # noqa: E501
+    system_msg = (
+        "You are a helpful assistant. Use the available tools when "
+        "needed to answer questions accurately."
+    )
     result = agent.invoke(
         {
             "messages": [
@@ -175,13 +178,13 @@ def test_tool_calling_no_infinite_loop(model_id: str, weather_tool: StructuredTo
             type(msg).__name__ == "AIMessage"
             and hasattr(msg, "tool_calls")
             and msg.tool_calls
-        )  # noqa: E501
+        )
     ]
     # The model should call the tool, but after receiving results,
     # should not call again. Allow flexibility - some models might make
     # 1 call, others might need 2, but should stop
     error_msg = (
-        f"Model made too many tool calls ({len(ai_tool_calls)}), possible infinite loop"  # noqa: E501
+        f"Model made too many tool calls ({len(ai_tool_calls)}), possible infinite loop"
     )
     assert len(ai_tool_calls) <= 2, error_msg
 
@@ -450,7 +453,7 @@ def should_continue(state: MessagesState):
             type(msg).__name__ == "AIMessage"
             and hasattr(msg, "tool_calls")
             and msg.tool_calls
-        )  # noqa: E501
+        )
     ]
     tool_result_messages = [
         msg for msg in messages if type(msg).__name__ == "ToolMessage"
@@ -464,7 +467,8 @@ def should_continue(state: MessagesState):
     # The agent should stop at or before the limit (8 tool calls)
     # This is the key protection against infinite loops
     assert len(tool_call_messages) <= 8, (
-        f"Too many tool calls ({len(tool_call_messages)}), max_sequential_tool_calls limit not enforced"  # noqa: E501
+        f"Too many tool calls ({len(tool_call_messages)}), "
+        "max_sequential_tool_calls limit not enforced"
     )
 
     # Verify tool results were received

libs/oci/tests/unit_tests/chat_models/test_oci_generative_ai.py

@@ -192,7 +192,7 @@ def mocked_response(*args, **kwargs):  # type: ignore[no-untyped-def]
                                                             {
                                                                 "type": "FUNCTION",
                                                                 "id": "call_456",
-                                                                "name": "get_weather",  # noqa: E501
+                                                                "name": "get_weather",
                                                                 "arguments": '{"location": "San Francisco"}',  # noqa: E501
                                                                 "attribute_map": {
                                                                     "id": "id",
@@ -330,7 +330,7 @@ def get_weather(location: str) -> str:
     # Test that tool choice raises ValueError
     with pytest.raises(
         ValueError, match="Tool choice is not supported for Cohere models"
-    ):  # noqa: E501
+    ):
         llm.bind_tools(
             tools=[get_weather],
             tool_choice="auto",
@@ -585,7 +585,7 @@ def test_auth_file_location(monkeypatch: MonkeyPatch) -> None:
     with patch("oci.config.from_file") as mock_from_file:
         with patch(
             "oci.generative_ai_inference.generative_ai_inference_client.validate_config"
-        ):  # noqa: E501
+        ):
             with patch("oci.base_client.validate_config"):
                 with patch("oci.signer.load_private_key"):
                     custom_config_path = "/custom/path/config"
@@ -595,7 +595,7 @@ def test_auth_file_location(monkeypatch: MonkeyPatch) -> None:
                     )
                     mock_from_file.assert_called_once_with(
                         file_location=custom_config_path, profile_name="DEFAULT"
-                    )  # noqa: E501
+                    )
 
 
 @pytest.mark.requires("oci")
@@ -643,7 +643,7 @@ def mocked_response(*args, **kwargs):  # type: ignore[no-untyped-def]
     # Test with include_raw=True
     structured_llm = llm.with_structured_output(
         WeatherResponse, method="json_schema", include_raw=True
-    )  # noqa: E501
+    )
     response = structured_llm.invoke(messages)
     assert isinstance(response, dict)
     assert "parsed" in response
@@ -694,7 +694,7 @@ def mocked_response(*args, **kwargs):  # type: ignore[no-untyped-def]
                                                             {
                                                                 "text": (
                                                                     "I'll help you."
-                                                                ),  # noqa: E501
+                                                                ),
                                                                 "type": "TEXT",
                                                             }
                                                         )
@@ -767,7 +767,7 @@ def mocked_response(*args, **kwargs):  # type: ignore[no-untyped-def]
                                                             {
                                                                 "text": (
                                                                     "I'll help you."
-                                                                ),  # noqa: E501
+                                                                ),
                                                                 "type": "TEXT",
                                                             }
                                                         )
@@ -829,7 +829,7 @@ def test_get_provider():
 
 
 @pytest.mark.requires("oci")
-def test_tool_choice_none_after_tool_results() -> None:  # noqa: E501
+def test_tool_choice_none_after_tool_results() -> None:
     """Test tool_choice='none' when max_sequential_tool_calls is exceeded.
 
     This prevents infinite loops with Meta Llama models by limiting the number
@@ -865,28 +865,28 @@ def get_weather(city: str) -> str:
             tool_calls=[
                 {"id": "call_1", "name": "get_weather", "args": {"city": "Chicago"}}
             ],
-        ),  # noqa: E501
+        ),
         ToolMessage(content="Sunny, 65°F", tool_call_id="call_1"),
         AIMessage(
             content="",
             tool_calls=[
                 {"id": "call_2", "name": "get_weather", "args": {"city": "New York"}}
             ],
-        ),  # noqa: E501
+        ),
         ToolMessage(content="Rainy, 55°F", tool_call_id="call_2"),
         AIMessage(
             content="",
             tool_calls=[
                 {"id": "call_3", "name": "get_weather", "args": {"city": "Seattle"}}
             ],
-        ),  # noqa: E501
+        ),
         ToolMessage(content="Cloudy, 60°F", tool_call_id="call_3"),
     ]
 
     # Prepare the request - need to pass tools from the bound model kwargs
     request = llm_with_tools._prepare_request(
         messages, stop=None, stream=False, **llm_with_tools.kwargs
-    )  # noqa: E501
+    )
 
     # Verify that tool_choice is set to 'none' because limit was reached
     assert hasattr(request.chat_request, "tool_choice")

libs/oracledb/langchain_oracledb/vectorstores/oraclevs.py

@@ -279,18 +279,21 @@ def _generate_condition(
                     bind_variables.append(json.dumps(v))
 
                     all_conditions.append(
-                        f"JSON_EQUAL(    JSON_QUERY(metadata, '$.{metadata_key}' ),    "
-                        f"JSON(:value{bind_l}))"
+                        f"JSON_EQUAL("
+                        f"    JSON_QUERY(metadata, '$.{metadata_key}' ),"
+                        f"    JSON(:value{bind_l})"
+                        ")"
                     )
 
                 elif k == "$ne":
                     bind_l = len(bind_variables)
                     bind_variables.append(json.dumps(v))
 
                     all_conditions.append(
-                        f"NOT (JSON_EQUAL(    "
-                        f"JSON_QUERY(metadata, '$.{metadata_key}' ),    "
-                        f"JSON(:value{bind_l})))"
+                        f"NOT (JSON_EQUAL("
+                        f"    JSON_QUERY(metadata, '$.{metadata_key}' ),"
+                        f"    JSON(:value{bind_l})"
+                        "))"
                     )
 
             res = " AND ".join(all_conditions)