Merge pull request #3 from JigsawStack/cleanup

Cleanup

Author: iamNarcisse

README.md

@@ -13,7 +13,7 @@ pip install jigsawstack
 First, you need to get an API key, which is available in the [JigsawStack Dashboard](https://jigsawstack.com).
 
 ```py
-from jigsawstack from JigsawStack
+from jigsawstack import JigsawStack
 
 import os
 
@@ -24,7 +24,7 @@ import os
 
 ```py
 import os
-from jigsawstack from JigsawStack
+from jigsawstack import JigsawStack
 
 
 ai = JigsawStack(api_key="your-api-key")

jigsawstack/__init__.py

@@ -1,10 +1,63 @@
+
+from typing import Union
 import os
-from ._client import JigsawStack
+from .audio import Audio
+from .vision import Vision
+from .search import Search
+from .prediction import Prediction
+from .sql import SQL
+from .store import KV, File
+from .translate import Translate
+from .web import Web
+from .sentiment import Sentiment
+from .validate import Validate
+from .summary import Summary
+
+class JigsawStack:
+    audio: Audio
+    vision : Vision
+    prediction: Prediction
+    sql: SQL
+    file: File
+    kv: KV
+    translate: Translate
+    web: Web
+    sentiment: Sentiment
+    validate: Validate
+    summary: Summary
+    search: Search
+    api_key: str
+    api_url: str
+
+
+    def __init__(self, api_key: Union[str, None] = None, api_url: Union[str, None] = None) -> None:
+        if api_key is None:
+            api_key = os.environ.get("JIGSAWSTACK_API_KEY")
+        
+        if api_key is None:
+            raise ValueError("The api_key client option must be set either by passing api_key to the client or by setting the JIGSAWSTACK_API_KEY environment variable")
+        
+        if api_url is None:
+            api_url = os.environ.get("JIGSAWSTACK_API_URL")
+        if api_url is None:
+            api_url = f"https://api.jigsawstack.com/v1"
+
+        self.api_key = api_key
+        self.api_url = api_url
 
-# Config vars
-api_key = os.environ.get("JIGSAWSTACK_API_KEY", "")
-api_url = os.environ.get("JIGSAWSTACK_API_URL", "https://api.jigsawstack.com")
 
+        self.audio = Audio(api_key=api_key, api_url=api_url)
+        self.web = Web(api_key=api_key, api_url=api_url)
+        self.search = Search(api_key=api_key, api_url=api_url)
+        self.sentiment = Sentiment(api_key=api_key, api_url=api_url)
+        self.validate = Validate(api_key=api_key, api_url=api_url)
+        self.summary = Summary(api_key=api_key, api_url=api_url)
+        self.vision = Vision(api_key=api_key, api_url=api_url)
+        self.prediction = Prediction(api_key=api_key, api_url=api_url)
+        self.sql = SQL(api_key=api_key, api_url=api_url)
+        self.file = File(api_key=api_key, api_url=api_url)
+        self.kv = KV(api_key=api_key, api_url=api_url)
+        self.translate = Translate(api_key=api_key, api_url=api_url)
 
 # Create a global instance of the Web class
 __all__ = ["JigsawStack"]

jigsawstack/_client.py

@@ -1,23 +1,30 @@
-
-from . import resources
 from typing import Union
-from ._config import ClientConfig
 import os
-
+from .audio import Audio
+from .vision import Vision
+from .searchs import Search
+from .predictions import Prediction
+from .sql import SQL
+from .store import KV, File
+from .translate import Translate
+from .web import Web
+from .sentiment import Sentiment
+from .validate import Validate
+from .summary import Summary
 
 class JigsawStack:
-    audio: resources.Audio
-    vision : resources.Vision
-    prediction: resources.Prediction
-    sql: resources.SQL
-    file: resources.File
-    kv: resources.KV
-    translate: resources.Translate
-    web: resources.Web
-    sentiment: resources.Sentiment
-    validate: resources.Validate
-    summary: resources.Summary
-    search: resources.Search
+    audio: Audio
+    vision : Vision
+    prediction: Prediction
+    sql: SQL
+    file: File
+    kv: KV
+    translate: Translate
+    web: Web
+    sentiment: Sentiment
+    validate: Validate
+    summary: Summary
+    search: Search
     api_key: str
     api_url: str
 
@@ -38,15 +45,15 @@ def __init__(self, api_key: Union[str, None] = None, api_url: Union[str, None] =
         self.api_url = api_url
 
 
-        self.audio = resources.Audio(api_key=api_key, api_url=api_url)
-        self.web = resources.Web(api_key=api_key, api_url=api_url)
-        self.search = resources.Search(api_key=api_key, api_url=api_url)
-        self.sentiment = resources.Sentiment(api_key=api_key, api_url=api_url)
-        self.validate = resources.Validate(api_key=api_key, api_url=api_url)
-        self.summary = resources.Summary(api_key=api_key, api_url=api_url)
-        self.vision = resources.Vision(api_key=api_key, api_url=api_url)
-        self.prediction = resources.Prediction(api_key=api_key, api_url=api_url)
-        self.sql = resources.SQL(api_key=api_key, api_url=api_url)
-        self.file = resources.File(api_key=api_key, api_url=api_url)
-        self.kv = resources.KV(api_key=api_key, api_url=api_url)
-        self.translate = resources.Translate(api_key=api_key, api_url=api_url)
+        self.audio = Audio(api_key=api_key, api_url=api_url)
+        self.web = Web(api_key=api_key, api_url=api_url)
+        self.search = Search(api_key=api_key, api_url=api_url)
+        self.sentiment = Sentiment(api_key=api_key, api_url=api_url)
+        self.validate = Validate(api_key=api_key, api_url=api_url)
+        self.summary = Summary(api_key=api_key, api_url=api_url)
+        self.vision = Vision(api_key=api_key, api_url=api_url)
+        self.prediction = Prediction(api_key=api_key, api_url=api_url)
+        self.sql = SQL(api_key=api_key, api_url=api_url)
+        self.file = File(api_key=api_key, api_url=api_url)
+        self.kv = KV(api_key=api_key, api_url=api_url)
+        self.translate = Translate(api_key=api_key, api_url=api_url)

jigsawstack/audio.py

@@ -0,0 +1,30 @@
+from typing import Any, Dict, List, cast
+from typing_extensions import NotRequired, TypedDict
+from .request import Request
+from ._config import ClientConfig
+from typing import Any, Dict, List, cast
+from typing_extensions import NotRequired, TypedDict
+
+class SpeechToTextParams(TypedDict):
+    url:str
+    file_store_key : NotRequired[str]
+    language : NotRequired[str]
+    translate : NotRequired[bool]
+    by_speaker : NotRequired[bool]
+    webhook_url : NotRequired[str]
+
+class SpeechToTextResponse(TypedDict):
+    success:bool
+    text : str
+    chunks : List[object]
+
+
+class Audio(ClientConfig):
+    def speech_to_text(self, params: SpeechToTextParams) -> SpeechToTextResponse:
+        path = "/ai/transcribe"
+        resp = Request(
+            api_key=self.api_key,
+            api_url=self.api_url,
+            path=path, params=cast(Dict[Any, Any], params), verb="post"
+        ).perform_with_content()
+        return resp

jigsawstack/audio/__init__.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, Union, cast
 from typing_extensions import NotRequired, TypedDict
-from jigsawstack import request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class Dataset(TypedDict):
@@ -39,7 +39,7 @@ class PredictionResponse(TypedDict):
 class Prediction(ClientConfig):
     def predict(self, params: PredictionParams) -> PredictionResponse:
         path = "/ai/prediction"
-        resp = request.Request(
+        resp = Request(
             api_key=self.api_key,
             api_url=self.api_url,
             path=path,params=cast(Dict[Any, Any], params),verb="post").perform_with_content()

jigsawstack/audio/_audio.py

@@ -1,10 +1,7 @@
 from typing import Any, Dict, Generic, List, Union, cast
-
 import requests
 from typing_extensions import Literal, TypeVar
-
-import jigsawstack
-from jigsawstack.exceptions import NoContentError, raise_for_code_and_type
+from .exceptions import NoContentError, raise_for_code_and_type
 
 RequestVerb = Literal["get", "post", "put", "patch", "delete"]
 
@@ -108,8 +105,6 @@ def make_request(self, url: str) -> requests.Response:
         headers = self.__get_headers()
         params = self.params
         verb = self.verb
-
-        print("ABOUT TO MAKE REQUEST WITH HEADERS",headers)
         try:
             return requests.request(verb, url, json=params, headers=headers,)
         except requests.HTTPError as e:

jigsawstack/audio/audio.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, cast
 from typing_extensions import NotRequired, TypedDict
-from jigsawstack import request
+from .request import Request
 from typing_extensions import NotRequired, TypedDict
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SearchAIResponse(TypedDict):
@@ -61,7 +61,7 @@ def ai_search(self,params: AISearchParams) -> SearchAIResponse:
         safe_search = params.get("safe_search","moderate")
         spell_check = params.get("spell_check", "True")
         path = f"/web/search?query={query}&ai_overview={ai_overview}&safe_search={safe_search}&spell_check={spell_check}"
-        resp = request.Request(
+        resp = Request(
             api_key=self.api_key,
             api_url=self.api_url,
             path=path, params=cast(Dict[Any, Any], params), verb="GET"
@@ -74,7 +74,7 @@ def ai_search(self,params: AISearchParams) -> SearchAIResponse:
     def suggestion(self, params: SearchSuggestionParams) -> SearchSuggestionResponse:
         query = params["query"]
         path = f"/web/search/suggest?query={query}"
-        resp = request.Request(
+        resp = Request(
             api_key=self.api_key,
             api_url=self.api_url,
             path=path, params=cast(Dict[Any, Any], params), verb="GET"

jigsawstack/prediction/_prediction.py renamed to jigsawstack/prediction.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, Union, cast
 from typing_extensions import NotRequired, TypedDict
-from jigsawstack import request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SentimentParams(TypedDict):
@@ -37,6 +37,6 @@ class SentimentResponse(TypedDict):
 class Sentiment(ClientConfig):
     def analyze(self, params: SentimentParams) -> SentimentResponse:
         path = "/ai/sentiment"
-        resp = request.Request(api_key=self.api_key,
+        resp = Request(api_key=self.api_key,
             api_url=self.api_url,path=path,params=cast(Dict[Any, Any], params),verb="post").perform_with_content()
         return resp

jigsawstack/prediction/__init__.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, Union, cast
 from typing_extensions import NotRequired, TypedDict
-from jigsawstack import request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SQLParams(TypedDict):
@@ -37,7 +37,7 @@ class SQL(ClientConfig):
     @classmethod
     def text_to_sql(self, params: SQLParams) -> SQLResponse:
         path = "/ai/sql"
-        resp = request.Request(
+        resp = Request(
             api_key=self.api_key,
             api_url=self.api_url,
             path=path,params=cast(Dict[Any, Any], params),verb="post").perform_with_content()