wip(upload): debug upload issues

Author: fatemefallah

src/basalam_sdk/base_client.py

@@ -103,26 +103,26 @@ async def request(
         Make an async request to the API.
         """
         url = urljoin(self.base_url, path)
-        
+
         # Build headers: start with config headers, add auth headers if needed, then custom headers
         request_headers = self.config.get_headers().copy()
-        
+
         if require_auth:
             auth_headers = await self.auth.get_auth_headers()
             request_headers.update(auth_headers)
-        
+
         if headers:
             request_headers.update(headers)
 
         async with httpx.AsyncClient(
-            headers=request_headers,
             timeout=self.config.timeout,
             follow_redirects=True,
         ) as client:
             try:
                 response = await client.request(
                     method=method,
                     url=url,
+                    headers=request_headers,
                     params=params,
                     data=data,
                     json=json_data,
@@ -154,26 +154,26 @@ def request_sync(
         Make a synchronous request to the API.
         """
         url = urljoin(self.base_url, path)
-        
+
         # Build headers: start with config headers, add auth headers if needed, then custom headers
         request_headers = self.config.get_headers().copy()
-        
+
         if require_auth:
             auth_headers = self.auth.get_auth_headers_sync()
             request_headers.update(auth_headers)
-        
+
         if headers:
             request_headers.update(headers)
 
         with httpx.Client(
-            headers=request_headers,
             timeout=self.config.timeout,
             follow_redirects=True,
         ) as client:
             try:
                 response = client.request(
                     method=method,
                     url=url,
+                    headers=request_headers,
                     params=params,
                     data=data,
                     json=json_data,

tests/test_upload_client.py

@@ -8,7 +8,7 @@
 from basalam_sdk import BasalamClient
 from basalam_sdk.auth import ClientCredentials
 from basalam_sdk.config import BasalamConfig, Environment
-from basalam_sdk.upload.models import UserUploadFileTypeEnum
+from basalam_sdk.upload.models import UserUploadFileTypeEnum, UploadFileRequest
 
 # Test client credentials
 TEST_CLIENT_ID = ""
@@ -30,20 +30,6 @@ def basalam_client():
     return BasalamClient(auth=auth, config=config)
 
 
-def create_test_file():
-    """Create a test file for upload testing."""
-    # Read the real PNG file from tests folder
-    import os
-    test_file_path = os.path.join(os.path.dirname(__file__), "test1.png")
-    with open(test_file_path, "rb") as f:
-        file_content = f.read()
-
-    file_obj = io.BytesIO(file_content)
-    file_obj.name = "test1.png"
-    file_obj.seek(0)  # Ensure we're at the beginning
-    return file_obj
-
-
 # -------------------------------------------------------------------------
 # Upload endpoints tests
 # -------------------------------------------------------------------------
@@ -52,18 +38,18 @@ def create_test_file():
 async def test_upload_file_async(basalam_client):
     """Test upload_file async method."""
     try:
-        test_file = create_test_file()
-        result = await basalam_client.upload.upload_file(
-            file=test_file,
-            file_type=UserUploadFileTypeEnum.CHAT_FILE.value,
-            custom_unique_name="test-file-async",
-            expire_minutes=60
-        )
-        print(f"upload_file async result: {result}")
-        assert result is not None
-        assert hasattr(result, 'id')
-        assert hasattr(result, 'file_name')
-        assert hasattr(result, 'urls')
+        with open('test1.png', "rb") as file_data:
+            result = await basalam_client.upload.upload_file(
+                file=file_data,
+                file_type="product.photo",
+                custom_unique_name="test-file-async",
+                expire_minutes=60
+            )
+            print(f"upload_file async result: {result}")
+            assert result is not None
+            assert hasattr(result, 'id')
+            assert hasattr(result, 'file_name')
+            assert hasattr(result, 'urls')
     except Exception as e:
         print(f"upload_file async error: {e}")
         # Don't fail the test for API errors, just log them
@@ -73,18 +59,18 @@ async def test_upload_file_async(basalam_client):
 def test_upload_file_sync(basalam_client):
     """Test upload_file_sync method."""
     try:
-        test_file = create_test_file()
-        result = basalam_client.upload.upload_file_sync(
-            file=test_file,
-            file_type='product.photo',
-            custom_unique_name="test-file-sync",
-            expire_minutes=60
-        )
-        print(f"upload_file_sync result: {result}")
-        assert result is not None
-        assert hasattr(result, 'id')
-        assert hasattr(result, 'file_name')
-        assert hasattr(result, 'urls')
+        with open('test1.png', "rb") as file_data:
+            result = basalam_client.upload.upload_file_sync(
+                file=file_data,
+                file_type='product.photo',
+                custom_unique_name="test-file-sync",
+                expire_minutes=60
+            )
+            print(f"upload_file_sync result: {result}")
+            assert result is not None
+            assert hasattr(result, 'id')
+            assert hasattr(result, 'file_name')
+            assert hasattr(result, 'urls')
     except Exception as e:
         print(f"upload_file_sync error: {e}")
         # Don't fail the test for API errors, just log them
@@ -95,16 +81,16 @@ def test_upload_file_sync(basalam_client):
 async def test_upload_file_minimal_params_async(basalam_client):
     """Test upload_file async method with minimal parameters."""
     try:
-        test_file = create_test_file()
-        result = await basalam_client.upload.upload_file(
-            file=test_file,
-            file_type=UserUploadFileTypeEnum.CHAT_PHOTO
-        )
-        print(f"upload_file minimal params async result: {result}")
-        assert result is not None
-        assert hasattr(result, 'id')
-        assert hasattr(result, 'file_name')
-        assert hasattr(result, 'urls')
+        with open('test1.png', "rb") as file_data:
+            result = await basalam_client.upload.upload_file(
+                file=file_data,
+                file_type=UserUploadFileTypeEnum.CHAT_PHOTO
+            )
+            print(f"upload_file minimal params async result: {result}")
+            assert result is not None
+            assert hasattr(result, 'id')
+            assert hasattr(result, 'file_name')
+            assert hasattr(result, 'urls')
     except Exception as e:
         print(f"upload_file minimal params async error: {e}")
         # Don't fail the test for API errors, just log them
@@ -114,11 +100,11 @@ async def test_upload_file_minimal_params_async(basalam_client):
 def test_upload_file_minimal_params_sync(basalam_client):
     """Test upload_file_sync method with minimal parameters."""
     try:
-        test_file = create_test_file()
-        result = basalam_client.upload.upload_file_sync(
-            file=test_file,
-            file_type=UserUploadFileTypeEnum.CHAT_PHOTO
-        )
+        with open('test1.png', "rb") as file_data:
+            result = basalam_client.upload.upload_file_sync(
+                file=file_data,
+                file_type=UserUploadFileTypeEnum.CHAT_PHOTO
+            )
         print(f"upload_file minimal params sync result: {result}")
         assert result is not None
         assert hasattr(result, 'id')
@@ -128,56 +114,3 @@ def test_upload_file_minimal_params_sync(basalam_client):
         print(f"upload_file minimal params sync error: {e}")
         # Don't fail the test for API errors, just log them
         assert True
-
-
-@pytest.mark.asyncio
-async def test_upload_file_different_types_async(basalam_client):
-    """Test upload_file async method with different file types."""
-    file_types_to_test = [
-        UserUploadFileTypeEnum.PRODUCT_PHOTO,
-        UserUploadFileTypeEnum.USER_AVATAR,
-        UserUploadFileTypeEnum.CHAT_VIDEO,
-        UserUploadFileTypeEnum.VENDOR_LOGO
-    ]
-
-    for file_type in file_types_to_test:
-        try:
-            test_file = create_test_file()
-            result = await basalam_client.upload.upload_file(
-                file=test_file,
-                file_type=file_type,
-                custom_unique_name=f"test-{file_type.value.replace('.', '-')}"
-            )
-            print(f"upload_file {file_type.value} async result: {result}")
-            assert result is not None
-            assert hasattr(result, 'id')
-        except Exception as e:
-            print(f"upload_file {file_type.value} async error: {e}")
-            # Don't fail the test for API errors, just log them
-            assert True
-
-
-def test_upload_file_different_types_sync(basalam_client):
-    """Test upload_file_sync method with different file types."""
-    file_types_to_test = [
-        UserUploadFileTypeEnum.PRODUCT_VIDEO,
-        UserUploadFileTypeEnum.USER_COVER,
-        UserUploadFileTypeEnum.CHAT_VOICE,
-        UserUploadFileTypeEnum.VENDOR_COVER
-    ]
-
-    for file_type in file_types_to_test:
-        try:
-            test_file = create_test_file()
-            result = basalam_client.upload.upload_file_sync(
-                file=test_file,
-                file_type=file_type,
-                custom_unique_name=f"test-{file_type.value.replace('.', '-')}"
-            )
-            print(f"upload_file {file_type.value} sync result: {result}")
-            assert result is not None
-            assert hasattr(result, 'id')
-        except Exception as e:
-            print(f"upload_file {file_type.value} sync error: {e}")
-            # Don't fail the test for API errors, just log them
-            assert True

tests/upload-test.py

@@ -1,55 +1,48 @@
-import requests
+import httpx
 from pydantic import BaseModel
-from enum import Enum
-from typing import List, Optional, Union, Dict
+from typing import Optional
 
 # === Configuration ===
 API_URL = "https://uploadio.basalam.com/v3/files"
+# if you use ClientCredentials token for this, it will give you 500!!, if you use personal token, it will pass
 AUTH_TOKEN = "Bearer"
 FILE_PATH = "test1.png"
 FILE_TYPE = "product.photo"
 CUSTOM_UNIQUE_NAME = "sample-image-name"
-EXPIRE_MINUTES = "60"
+EXPIRE_MINUTES = 60
 
 
 class UploadFileRequest(BaseModel):
-    """Upload file request model matching OpenAPI Body_create_file_v3_files_post schema."""
     file_type: str
     custom_unique_name: Optional[str] = None
     expire_minutes: Optional[int] = None
 
 
 # === File Upload ===
 with open(FILE_PATH, "rb") as file_data:
-    files = {
-        "file": file_data,
-    }
-
-    # data = {
-    #     "file_type": FILE_TYPE,
-    #     "custom_unique_name": CUSTOM_UNIQUE_NAME,
-    #     "expire_minutes": EXPIRE_MINUTES,
-    # }
     request = UploadFileRequest(
         file_type=FILE_TYPE,
         custom_unique_name=CUSTOM_UNIQUE_NAME,
         expire_minutes=EXPIRE_MINUTES
     )
 
-    # Convert to form data, excluding None values
+    # Create the files and data separately
+    files = {
+        "file": (file_data)
+    }
     data = request.model_dump(exclude_none=True, mode='json')
 
-    print(">>>", data)
     headers = {
         "Authorization": AUTH_TOKEN,
     }
 
     print("Sending upload request...")
 
-    response = requests.post(API_URL, headers=headers, files=files, data=data)
+    print('sinaaaaaaaaaaaa', 'post',API_URL, headers, data, files)
+    with httpx.Client(timeout=60.0) as client:
+        response = client.request('post',API_URL, headers=headers, data=data, files=files)
 
     print("Status code:", response.status_code)
-
     try:
         print("Response:", response.json())
     except Exception: