Build path using helper to avoid adding none params

Author: Khurdhula-Harshavardhan

jigsawstack/store.py

@@ -3,18 +3,14 @@
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest, AsyncRequestConfig
 from ._config import ClientConfig
-
-
-
-
+from .helpers import build_path
+from .exceptions import JigsawStackError
 class FileDeleteResponse(TypedDict):
     success: bool
 
-
-
 class FileUploadParams(TypedDict):
-    overwrite: bool
-    filename: str
+    overwrite: NotRequired[bool]
+    filename: NotRequired[str]
     content_type: NotRequired[str]
 
 class Store(ClientConfig):
@@ -34,19 +30,19 @@ def __init__(
             disable_request_logging=disable_request_logging,
         )
 
-    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}"
-        content_type = options.get("content_type")
-        _headers = {"Content-Type": "application/octet-stream"}
-        if content_type is not None:
-            _headers = {"Content-Type": content_type}
+    def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> Any:
+        if options is None:
+            options = {}
+            
+        path = build_path(base_path="/store/file", params=options)
+        print(path)
+        content_type = options.get("content_type", "application/octet-stream")
+        
+        _headers = {"Content-Type": content_type}
 
         resp = Request(
             config=self.config,
-            params=params,
+            params=options,  # Empty params since we're using them in the URL
             path=path,
             data=file,
             headers=_headers,
@@ -92,19 +88,19 @@ def __init__(
         )
 
 
-    async 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}"
+    async def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> Any:
+        if options is None:
+            options = {}
+            
+        path = build_path(base_path="/store/file", params=options)
         content_type = options.get("content_type")
         _headers = {"Content-Type": "application/octet-stream"}
         if content_type is not None:
             _headers = {"Content-Type": content_type}
 
         resp = await AsyncRequest(
             config=self.config,
-            params=params,
+            params={},  # Empty params since we're using them in the URL
             path=path,
             data=file,
             headers=_headers,