change base url

Author: CodeBooster97

audiostack/content/file.py

@@ -11,22 +11,16 @@
 
 
 class File:
-    FAMILY = "content"
+    FAMILY = "v3"
     interface = RequestInterface(family=FAMILY)
 
     class Item(APIResponseItem):
         def __init__(self, response: dict) -> None:
             super().__init__(response)
             self.file_id = response["fileId"]
             self.file_name = response["fileName"]
-            self.url = response.get("url", None)
-            self.created_by = response["createdBy"]
-            self.last_modified = response.get("lastModified", None)
-            self.file_type_id = response["fileTypeId"]
-            self.category_id = response.get("categoryId", None)
-            self.size = response["size"]
-            self.created_at = response["createdAt"]
-            self.status = response["status"]
+            self.folder_id = response["folderId"]
+            self.content_type = response["mimeType"]
 
         def download(self, fileName: str, path: str = "./") -> None:
             if not fileName:
@@ -61,27 +55,20 @@ def create(
         if not file_name:
             raise Exception("Please supply a valid file name")
 
-        if not folder_id:
-            Folder.get_root().data["folders"]["folderId"]
-
-        category_id = File.get_category_id_by_name(category)
-
         payload = {
             "fileName": file_name,
             "folderId": folder_id,
-            "categoryId": category_id,
         }
 
+        if category:
+            payload["categoryId"] = File.get_category_id_by_name(category)
+
         r = File.interface.send_request(
             rtype=RequestTypes.POST,
             route="file/create-upload-url",
             json=payload,
-            overwrite_base_url="https://v2.api.audio/v3",
         )
-        response = APIResponseItem(r)
-        url = response.data["uploadUrl"]
-
-        File.interface.send_upload_request(local_path=local_path, upload_url=url)
+        File.interface.send_upload_request(local_path=local_path, upload_url=r["uploadUrl"], mime_type=r["mimeType"])
         return File.Item(r)
 
     @staticmethod
@@ -99,7 +86,6 @@ def modify(
             rtype=RequestTypes.PATCH,
             route=f"file/{file_id}",
             json=payload,
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return File.Item(r)
 
@@ -108,7 +94,6 @@ def get(file_id: str) -> Item:
         r = File.interface.send_request(
             rtype=RequestTypes.GET,
             route=f"file/{file_id}",
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return File.Item(r)
 
@@ -118,7 +103,6 @@ def delete(file_id: str, folder_id: str) -> APIResponseItem:
         r = File.interface.send_request(
             rtype=RequestTypes.DELETE,
             route=f"file/{file_id}/{folder_id}",
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)
 
@@ -127,7 +111,6 @@ def get_file_categories() -> APIResponseItem:
         r = File.interface.send_request(
             rtype=RequestTypes.GET,
             route="file/metadata/file-categories",
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)
 
@@ -144,7 +127,7 @@ def get_category_id_by_name(name: str) -> Optional[UUID]:
 
 
 class Folder:
-    FAMILY = "content"
+    FAMILY = "v3"
     interface = RequestInterface(family=FAMILY)
 
     class Item(APIResponseItem):
@@ -168,8 +151,7 @@ def resolve_item(self, list_type: str, item: Any) -> dict:
     def get_root() -> Item:
         r = Folder.interface.send_request(
             rtype=RequestTypes.GET,
-            route="v3/file/folder",
-            overwrite_base_url="https://v2.api.audio",
+            route="folder",
         )
         return Folder.Item(r)
 
@@ -181,9 +163,8 @@ def create(name: str, parent_folder_id: Optional[UUID] = None) -> APIResponseIte
         }
         r = Folder.interface.send_request(
             rtype=RequestTypes.POST,
-            route="file/folder",
+            route="folder",
             json=folder,
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)
 
@@ -192,7 +173,6 @@ def get(folder_id: UUID) -> APIResponseItem:
         r = Folder.interface.send_request(
             rtype=RequestTypes.GET,
             route=f"folder/{folder_id}",
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)
 
@@ -208,7 +188,6 @@ def modify(
             rtype=RequestTypes.PATCH,
             route=f"folder/{folder_id}",
             json=folder,
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)
 
@@ -217,6 +196,5 @@ def delete(folder_id: UUID) -> APIResponseItem:
         r = File.interface.send_request(
             rtype=RequestTypes.DELETE,
             route=f"folder/{folder_id}",
-            overwrite_base_url="https://v2.api.audio/v3",
         )
         return APIResponseItem(r)

audiostack/helpers/request_interface.py

@@ -78,15 +78,16 @@ def resolve_response(self, r: Any) -> dict:
 
         return {**r.json(), **{"statusCode": r.status_code}}
 
-    def send_upload_request(self, local_path: str, upload_url: str) -> int:
+    def send_upload_request(self, local_path: str, upload_url: str, mime_type: str) -> int:
         with open(local_path, "rb") as data:
-            r = requests.put(url=upload_url, data=data)
-
+            r = requests.put(url=upload_url, data=data, headers={"Content-Type": mime_type})
+            print("Upload response:", r.text)
             if r.status_code >= 400:
                 raise Exception("Failed to upload file")
 
             return r.status_code
 
+
     def send_request(
         self,
         rtype: str,