update to be in init instead of request

Author: winzamark123

jigsawstack/__init__.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Dict
 import os
 from .audio import Audio, AsyncAudio
 from .vision import Vision, AsyncVision
@@ -27,13 +27,15 @@ class JigsawStack:
     classification: Classification
     api_key: str
     api_url: str
-    disable_request_logging: bool
+    headers: Dict[str, str]
+    # disable_request_logging: bool
 
     def __init__(
         self,
         api_key: Union[str, None] = None,
         api_url: Union[str, None] = None,
-        disable_request_logging: Union[bool, None] = None,
+        # disable_request_logging: Union[bool, None] = None,
+        headers: Union[Dict[str, str], None] = None,
     ) -> None:
         if api_key is None:
             api_key = os.environ.get("JIGSAWSTACK_API_KEY")
@@ -51,6 +53,10 @@ def __init__(
         self.api_key = api_key
         self.api_url = api_url
 
+        self.headers = headers or {}
+
+        disable_request_logging = self.headers.get("x-jigsaw-no-request-log")
+
         self.audio = Audio(
             api_key=api_key,
             api_url=api_url,

jigsawstack/async_request.py

@@ -36,7 +36,9 @@ def __init__(
         self.disable_request_logging = config.get("disable_request_logging")
         self.stream = stream
 
-    def __convert_params(self, params: Union[Dict[Any, Any], List[Dict[Any, Any]]]) -> Dict[str, str]:
+    def __convert_params(
+        self, params: Union[Dict[Any, Any], List[Dict[Any, Any]]]
+    ) -> Dict[str, str]:
         """
         Convert parameters to string values for URL encoding.
         """
@@ -45,10 +47,10 @@ def __convert_params(self, params: Union[Dict[Any, Any], List[Dict[Any, Any]]])
 
         if isinstance(params, str):
             return params
-        
+
         if isinstance(params, list):
             return {}  # List params are only used in JSON body
-        
+
         converted = {}
         for key, value in params.items():
             if isinstance(value, bool):
@@ -67,7 +69,15 @@ async def perform(self) -> Union[T, None]:
             # For binary responses
             if resp.status == 200:
                 content_type = resp.headers.get("content-type", "")
-                if not resp.text or any(t in content_type for t in ["audio/", "image/", "application/octet-stream", "image/png"]):
+                if not resp.text or any(
+                    t in content_type
+                    for t in [
+                        "audio/",
+                        "image/",
+                        "application/octet-stream",
+                        "image/png",
+                    ]
+                ):
                     content = await resp.read()
                     return cast(T, content)
 

jigsawstack/request.py

@@ -12,7 +12,7 @@
 class RequestConfig(TypedDict):
     api_url: str
     api_key: str
-    headers: Dict[str, str]
+    disable_request_logging: Union[bool, None] = False
 
 
 # This class wraps the HTTP request creation logic
@@ -34,9 +34,7 @@ def __init__(
         self.api_key = config.get("api_key")
         self.data = data
         self.headers = headers
-        self.disable_request_logging = config.get("headers", {}).get(
-            "x-jigsaw-no-request-log"
-        )
+        self.disable_request_logging = config.get("disable_request_logging")
         self.stream = stream
 
     def perform(self) -> Union[T, None]: