Clean up

Author: iamNarcisse

jigsawstack/__init__.py

@@ -21,7 +21,7 @@ class JigsawStack:
     audio: Audio
     vision : Vision
     prediction: Prediction
-    sql: SQL
+    text_to_sql: SQL
     file: Store
     kv: KV
     translate: Translate
@@ -54,15 +54,15 @@ def __init__(self, api_key: Union[str, None] = None, api_url: Union[str, None] =
 
         self.audio = Audio(api_key=api_key, api_url=api_url)
         self.web = Web(api_key=api_key, api_url=api_url)
-        self.sentiment = Sentiment(api_key=api_key, api_url=api_url)
+        self.sentiment = Sentiment(api_key=api_key, api_url=api_url).analyze
         self.validate = Validate(api_key=api_key, api_url=api_url)
-        self.summary = Summary(api_key=api_key, api_url=api_url)
+        self.summary = Summary(api_key=api_key, api_url=api_url).summarize
         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.prediction = Prediction(api_key=api_key, api_url=api_url).predict
+        self.text_to_sql = SQL(api_key=api_key, api_url=api_url).text_to_sql
         self.store = Store(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)
+        self.translate = Translate(api_key=api_key, api_url=api_url).translate
         self.geo = Geo(api_key=api_key, api_url=api_url)
         self.prompt_engine = PromptEngine(api_key=api_key, api_url=api_url)
 

jigsawstack/store.py

@@ -37,6 +37,10 @@ class Store(ClientConfig):
     def upload(self, file: bytes, options=FileUploadParams) -> Any:
         overwrite = options.get("overwrite")
         filename = options.get("filename")
+        params = {
+            "key":filename,
+            "overwrite":overwrite
+        }
         path =f"/store/file?overwrite={overwrite}&key={filename}"
         headers = options.get("headers")
         _headers = {"Content-Type":"application/octet-stream"}
@@ -46,7 +50,7 @@ def upload(self, file: bytes, options=FileUploadParams) -> Any:
         resp = Request(
             api_key=self.api_key,
             api_url=self.api_url,
-            params=None,
+            params=params,
             path=path,  data=file, headers=_headers, verb="post"
 
         ).perform_with_content()

jigsawstack/validate.py

@@ -72,13 +72,12 @@ def email(self, params: EmailValidationParams) -> EmailValidationResponse:
         ).perform_with_content()
         return resp
 
-    def nsfw(self, params: NSFWParams) -> NSFWResponse:
-        url = params.get("url")
+    def nsfw(self, url:str) -> NSFWResponse:
         path = f"/validate/nsfw?url={url}"
         resp = Request(
              api_url=self.api_url,
             api_key=self.api_key,
-            path=path, params=cast(Dict[Any, Any], params), verb="get"
+            path=path, params=cast(Dict[Any, Any], params={"url":url}), verb="get"
         ).perform_with_content()
         return resp
 
@@ -95,7 +94,7 @@ def profanity(self, params: ProfanityParams) -> ProfanityResponse:
         return resp
 
 
-    def spell_check(self, params: SpellCheckParams) -> SpellCheckResponse:
+    def spellcheck(self, params: SpellCheckParams) -> SpellCheckResponse:
         text = params.get("text")
         language_code = params.get("language_code","en")
         path = f"/validate/spell_check?text={text}&language_code={language_code}"
@@ -105,7 +104,7 @@ def spell_check(self, params: SpellCheckParams) -> SpellCheckResponse:
             path=path, params=cast(Dict[Any, Any], params), verb="get"
         ).perform_with_content()
         return resp
-    def spam_check(self, params: SpamCheckParams) -> SpamCheckResponse:
+    def spamcheck(self, params: SpamCheckParams) -> SpamCheckResponse:
         path = "/ai/spamcheck"
         resp = Request(
             api_url=self.api_url,

tests/test_sentiment.py

@@ -16,7 +16,8 @@ def test_sentiment_response_success(self) -> None:
             "text": "I am so excited"
         }
         try:
-            result = client.sentiment.analyze(params)
+            result = client.sentiment(params)
             assert result["success"] == True
         except JigsawStackError as e:
+
             assert e.message == "Failed to parse API response. Please try again."