chore: drop redundant disable logging flag.

Author: Khurdhula-Harshavardhan

jigsawstack/__init__.py

@@ -62,97 +62,37 @@ 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 + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.web = Web(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.sentiment = Sentiment(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).analyze
-
-        self.validate = Validate(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-        self.summary = Summary(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).summarize
-
-        self.vision = Vision(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.prediction = Prediction(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).predict
-
-        self.text_to_sql = SQL(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).text_to_sql
-
-        self.store = Store(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-        self.translate = Translate(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.embedding = Embedding(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).execute
-
-        self.embedding_v2 = EmbeddingV2(
-            api_key=api_key,
-            api_url=api_url + "/v2",
-            disable_request_logging=disable_request_logging,
-        ).execute
+        self.headers = headers or {"Content-Type": "application/json"}
+
+        self.audio = Audio(api_key=api_key, api_url=api_url + "/v1")
+
+        self.web = Web(api_key=api_key, api_url=api_url + "/v1")
+
+        self.sentiment = Sentiment(api_key=api_key, api_url=api_url + "/v1").analyze
+
+        self.validate = Validate(api_key=api_key, api_url=api_url + "/v1")
+        self.summary = Summary(api_key=api_key, api_url=api_url + "/v1").summarize
+
+        self.vision = Vision(api_key=api_key, api_url=api_url + "/v1")
+
+        self.prediction = Prediction(api_key=api_key, api_url=api_url + "/v1").predict
+
+        self.text_to_sql = SQL(api_key=api_key, api_url=api_url + "/v1").text_to_sql
+
+        self.store = Store(api_key=api_key, api_url=api_url + "/v1")
+        self.translate = Translate(api_key=api_key, api_url=api_url + "/v1")
+
+        self.embedding = Embedding(api_key=api_key, api_url=api_url + "/v1").execute
+
+        self.embedding_v2 = EmbeddingV2(api_key=api_key, api_url=api_url + "/v2").execute
 
         self.image_generation = ImageGeneration(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
+            api_key=api_key, api_url=api_url + "/v1"
         ).image_generation
 
-        self.classification = Classification(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).classify
+        self.classification = Classification(api_key=api_key, api_url=api_url + "/v1").classify
 
-        self.prompt_engine = PromptEngine(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
+        self.prompt_engine = PromptEngine(api_key=api_key, api_url=api_url + "/v1")
 
 
 class AsyncJigsawStack:
@@ -179,7 +119,7 @@ def __init__(
         self,
         api_key: Union[str, None] = None,
         api_url: Union[str, 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")
@@ -196,96 +136,38 @@ def __init__(
 
         self.api_key = api_key
         self.api_url = api_url
-        disable_request_logging = self.headers.get("x-jigsaw-no-request-log")
-
-        self.web = AsyncWeb(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.validate = AsyncValidate(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-        self.audio = AsyncAudio(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.vision = AsyncVision(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.store = AsyncStore(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.summary = AsyncSummary(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).summarize
-
-        self.prediction = AsyncPrediction(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).predict
-
-        self.text_to_sql = AsyncSQL(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).text_to_sql
-
-        self.sentiment = AsyncSentiment(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).analyze
-
-        self.translate = AsyncTranslate(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
-
-        self.embedding = AsyncEmbedding(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).execute
-
-        self.embedding_v2 = AsyncEmbeddingV2(
-            api_key=api_key,
-            api_url=api_url + "/v2",
-            disable_request_logging=disable_request_logging,
-        ).execute
+        self.headers = headers or {"Content-Type": "application/json"}
+
+        self.web = AsyncWeb(api_key=api_key, api_url=api_url + "/v1")
+
+        self.validate = AsyncValidate(api_key=api_key, api_url=api_url + "/v1")
+        self.audio = AsyncAudio(api_key=api_key, api_url=api_url + "/v1")
+
+        self.vision = AsyncVision(api_key=api_key, api_url=api_url + "/v1")
+
+        self.store = AsyncStore(api_key=api_key, api_url=api_url + "/v1")
+
+        self.summary = AsyncSummary(api_key=api_key, api_url=api_url + "/v1").summarize
+
+        self.prediction = AsyncPrediction(api_key=api_key, api_url=api_url + "/v1").predict
+
+        self.text_to_sql = AsyncSQL(api_key=api_key, api_url=api_url + "/v1").text_to_sql
+
+        self.sentiment = AsyncSentiment(api_key=api_key, api_url=api_url + "/v1").analyze
+
+        self.translate = AsyncTranslate(api_key=api_key, api_url=api_url + "/v1")
+
+        self.embedding = AsyncEmbedding(api_key=api_key, api_url=api_url + "/v1").execute
+
+        self.embedding_v2 = AsyncEmbeddingV2(api_key=api_key, api_url=api_url + "/v2").execute
 
         self.image_generation = AsyncImageGeneration(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
+            api_key=api_key, api_url=api_url + "/v1"
         ).image_generation
 
-        self.classification = AsyncClassification(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        ).classify
-
-        self.prompt_engine = AsyncPromptEngine(
-            api_key=api_key,
-            api_url=api_url + "/v1",
-            disable_request_logging=disable_request_logging,
-        )
+        self.classification = AsyncClassification(api_key=api_key, api_url=api_url + "/v1").classify
+
+        self.prompt_engine = AsyncPromptEngine(api_key=api_key, api_url=api_url + "/v1")
 
 
 # Create a global instance of the Web class

jigsawstack/async_request.py

@@ -37,7 +37,6 @@ def __init__(
         self.api_key = config.get("api_key")
         self.data = data
         self.headers = headers or {"Content-Type": "application/json"}
-        self.disable_request_logging = config.get("disable_request_logging")
         self.stream = stream
         self.files = files  # Store files for multipart requests
 

tests/test_embedding.py

@@ -246,7 +246,7 @@ class TestEmbeddingV2Sync:
     def test_embedding_v2(self, test_case):
         """Test synchronous embedding v2 with various inputs"""
         try:
-            result = jigsaw.embeddingV2(test_case["params"])
+            result = jigsaw.embedding_v2(test_case["params"])
             assert result["success"]
             assert "embeddings" in result
             assert isinstance(result["embeddings"], list)
@@ -271,7 +271,7 @@ def test_embedding_v2_blob(self, test_case):
         try:
             # Download blob content
             blob_content = requests.get(test_case["blob_url"]).content
-            result = jigsaw.embeddingV2(blob_content, test_case["options"])
+            result = jigsaw.embedding_v2(blob_content, test_case["options"])
             assert result["success"]
             assert "embeddings" in result
             assert isinstance(result["embeddings"], list)
@@ -291,7 +291,7 @@ class TestEmbeddingV2Async:
     async def test_embedding_v2_async(self, test_case):
         """Test asynchronous embedding v2 with various inputs"""
         try:
-            result = await async_jigsaw.embeddingV2(test_case["params"])
+            result = await async_jigsaw.embedding_v2(test_case["params"])
             assert result["success"]
             assert "embeddings" in result
             assert isinstance(result["embeddings"], list)
@@ -317,7 +317,7 @@ async def test_embedding_v2_blob_async(self, test_case):
         try:
             # Download blob content
             blob_content = requests.get(test_case["blob_url"]).content
-            result = await async_jigsaw.embeddingV2(blob_content, test_case["options"])
+            result = await async_jigsaw.embedding_v2(blob_content, test_case["options"])
             assert result["success"]
             assert "embeddings" in result
             assert isinstance(result["embeddings"], list)