fix: Fix proxy usage (box/box-codegen#662) (#476)

Author: box-sdk-build

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "2c730de", "specHash": "59747aa", "version": "1.11.0" }
+{ "engineHash": "59337f7", "specHash": "59747aa", "version": "1.11.0" }

box_sdk_gen/networking/network.py

@@ -1,4 +1,3 @@
-import requests
 from typing import Dict
 
 from .network_client import NetworkClient
@@ -26,16 +25,21 @@ def __init__(
             retry_strategy = BoxRetryStrategy()
         if network_client is None:
             network_client = BoxNetworkClient()
-        self.requests_session = requests.Session()
+        if (
+            proxy_url
+            and hasattr(network_client, 'requests_session')
+            and network_client.requests_session
+        ):
+            network_client.requests_session.proxies = {
+                'http': proxy_url,
+                'https': proxy_url,
+            }
         self.additional_headers = additional_headers
         self.base_urls = base_urls
         self.proxy_url = proxy_url
         self.network_client = network_client
         self.retry_strategy = retry_strategy
 
-        proxies = {'http': proxy_url, 'https': proxy_url} if proxy_url else {}
-        self.requests_session.proxies = proxies
-
     def with_additional_headers(
         self, additional_headers: Dict[str, str] = None
     ) -> 'NetworkSession':
@@ -80,11 +84,11 @@ def with_proxy(self, config: ProxyConfig) -> 'NetworkSession':
 
         proxy_host = config.url.split("//")[1]
         proxy_auth = (
-            f'{config.username}:{config.password}@'
+            f"{config.username}:{config.password}@"
             if config.username and config.password
-            else ''
+            else ""
         )
-        proxy_url = f'http://{proxy_auth}{proxy_host}'
+        proxy_url = f"http://{proxy_auth}{proxy_host}"
         return NetworkSession(
             network_client=self.network_client,
             additional_headers=self.additional_headers,
@@ -112,7 +116,7 @@ def with_retry_strategy(self, retry_strategy: RetryStrategy) -> 'NetworkSession'
         """
         Generate a fresh network session by duplicating the existing configuration and network parameters,
         while also including a new retry options to be used for each API call.
-        :param retry_options: RetryOptions object, which contains the retry logic
+        :param retry_strategy: RetryStrategy object, which contains the retry logic
         :return: a new instance of NetworkSession
         """
         return NetworkSession(

docs/ai.md

@@ -167,7 +167,7 @@ See the endpoint docs at
 client.ai.create_ai_extract(
     "firstName, lastName, location, yearOfBirth, company",
     [AiItemBase(id=file.id)],
-    ai_agent=ai_extract_agent_config,
+    ai_agent=agent_ignoring_overriding_embeddings_model,
 )
 ```
 

test/ai.py

@@ -84,6 +84,8 @@
 
 from box_sdk_gen.schemas.ai_agent_extract_structured import AiAgentExtractStructured
 
+from box_sdk_gen.schemas.ai_agent_long_text_tool import AiAgentLongTextTool
+
 client: BoxClient = get_default_client()
 
 
@@ -216,6 +218,17 @@ def testAIExtract():
     ai_extract_agent_config: AiAgentExtract = client.ai.get_ai_agent_default_config(
         GetAiAgentDefaultConfigMode.EXTRACT, language='en-US'
     )
+    long_text_config_with_no_embeddings: AiAgentLongTextTool = AiAgentLongTextTool(
+        system_message=ai_extract_agent_config.long_text.system_message,
+        prompt_template=ai_extract_agent_config.long_text.prompt_template,
+        model=ai_extract_agent_config.long_text.model,
+        num_tokens_for_completion=ai_extract_agent_config.long_text.num_tokens_for_completion,
+        llm_endpoint_params=ai_extract_agent_config.long_text.llm_endpoint_params,
+    )
+    agent_ignoring_overriding_embeddings_model: AiAgentExtract = AiAgentExtract(
+        basic_text=ai_extract_agent_config.basic_text,
+        long_text=long_text_config_with_no_embeddings,
+    )
     uploaded_files: Files = client.uploads.upload_file(
         UploadFileAttributes(
             name=''.join([get_uuid(), '.txt']),
@@ -230,7 +243,7 @@ def testAIExtract():
     response: AiResponse = client.ai.create_ai_extract(
         'firstName, lastName, location, yearOfBirth, company',
         [AiItemBase(id=file.id)],
-        ai_agent=ai_extract_agent_config,
+        ai_agent=agent_ignoring_overriding_embeddings_model,
     )
     expected_response: str = (
         '{"firstName": "John", "lastName": "Doe", "location": "San Francisco", "yearOfBirth": "1990", "company": "Box"}'
@@ -246,14 +259,12 @@ def testAIExtractStructuredWithFields():
             GetAiAgentDefaultConfigMode.EXTRACT_STRUCTURED, language='en-US'
         )
     )
-    long_text_config_with_no_embeddings: AiAgentExtractStructured = (
-        AiAgentExtractStructured(
-            system_message=ai_extract_structured_agent_config.long_text.system_message,
-            prompt_template=ai_extract_structured_agent_config.long_text.prompt_template,
-            model=ai_extract_structured_agent_config.long_text.model,
-            num_tokens_for_completion=ai_extract_structured_agent_config.long_text.num_tokens_for_completion,
-            llm_endpoint_params=ai_extract_structured_agent_config.long_text.llm_endpoint_params,
-        )
+    long_text_config_with_no_embeddings: AiAgentLongTextTool = AiAgentLongTextTool(
+        system_message=ai_extract_structured_agent_config.long_text.system_message,
+        prompt_template=ai_extract_structured_agent_config.long_text.prompt_template,
+        model=ai_extract_structured_agent_config.long_text.model,
+        num_tokens_for_completion=ai_extract_structured_agent_config.long_text.num_tokens_for_completion,
+        llm_endpoint_params=ai_extract_structured_agent_config.long_text.llm_endpoint_params,
     )
     agent_ignoring_overriding_embeddings_model: AiAgentExtractStructured = (
         AiAgentExtractStructured(

test/box_network_client.py

@@ -955,7 +955,7 @@ def test_proxy_config():
         ProxyConfig(url="http://127.0.0.1:3128/", username="user", password="pass")
     )
     assert client.network_session.proxy_url == "http://user:[email protected]:3128/"
-    requests_session = client.network_session.requests_session
+    requests_session = client.network_session.network_client.requests_session
     assert requests_session.proxies["http"] == "http://user:[email protected]:3128/"
     assert requests_session.proxies["https"] == "http://user:[email protected]:3128/"