Clean up

Author: iamNarcisse

jigsawstack/__init__.py

@@ -1,5 +1,63 @@
 
-from ._client import JigsawStack
+from typing import Union
+import os
+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
+
+
+        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

@@ -2,8 +2,8 @@
 import os
 from .audio import Audio
 from .vision import Vision
-from .search import Search
-from .prediction import Prediction
+from .searchs import Search
+from .predictions import Prediction
 from .sql import SQL
 from .store import KV, File
 from .translate import Translate

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 ..request import Request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class Dataset(TypedDict):

jigsawstack/audio/_audio.py

@@ -105,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 ..request import Request
+from .request import Request
 from typing_extensions import NotRequired, TypedDict
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SearchAIResponse(TypedDict):

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 ..request import Request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SentimentParams(TypedDict):

jigsawstack/prediction/__init__.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, List, Union, cast
 from typing_extensions import NotRequired, TypedDict
-from ..request import Request
+from .request import Request
 from typing import List, Union
-from .._config import ClientConfig
+from ._config import ClientConfig
 
 
 class SQLParams(TypedDict):

jigsawstack/request.py

@@ -0,0 +1,79 @@
+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 FileDeleteResponse(TypedDict):
+    success:bool
+
+
+class KVGetParams(TypedDict):
+    key:str
+
+class KVGetResponse(TypedDict):
+    success:bool
+    value : str
+
+class KVAddParams(TypedDict):
+    key:str
+    value :str
+    encrypt : NotRequired[bool]
+
+class KVAddResponse(TypedDict):
+    success:bool
+
+
+
+class File(ClientConfig):
+    
+
+    def get(self, key: str) -> Any:
+        path =f"/store/file/{key}"
+        resp = Request(
+            api_key=self.api_key,
+            api_url=self.api_url,
+            path=path, params=cast(Dict[Any, Any], params={}), verb="get"
+        ).perform_with_content()
+        return resp
+
+    def delete(self, key: str) -> FileDeleteResponse:
+        path =f"/store/file/{key}"
+        resp = Request(
+            api_key=self.api_key,
+            api_url=self.api_url,
+            path=path, params=cast(Dict[Any, Any], params={}), verb="delete"
+        ).perform_with_content()
+        return resp
+    
+
+class KV(ClientConfig):
+ 
+    def add(self, params: KVAddParams) -> KVAddResponse:
+        path = "/store/kv"
+        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
+    
+    def get(self, key: str) -> KVGetResponse:
+        path =f"/store/kv/{key}"
+        resp = Request(
+            api_key=self.api_key,
+            api_url=self.api_url,
+            path=path, params=cast(Dict[Any, Any], params={}), verb="get"
+        ).perform_with_content()
+        return resp
+    
+
+    def delete(self, key: str) -> KVGetResponse:
+        path =f"/store/kv/{key}"
+        resp = Request(
+            api_key=self.api_key,
+            api_url=self.api_url,
+            path=path, params=cast(Dict[Any, Any], params={}), verb="delete"
+        ).perform_with_content()
+        return resp