Merge pull request #11 from shiningflash/refactoring

Refactor: migrate utils to common module and reorganize test structure

config.py

@@ -1,6 +1,6 @@
 from pydantic import Field, field_validator, ConfigDict
 from pydantic_settings import BaseSettings
-from src.sdk.utils.logger import logger
+from src.common.logger import logger
 
 
 class Settings(BaseSettings):

docs/sdk_usage.md

@@ -171,7 +171,7 @@ The SDK includes comprehensive logging for debugging and auditing. Logs are cate
 Example of enabling logger in your application:
 
 ```python
-from src.sdk.utils.logger import logger
+from src.common.logger import logger
 
 logger.info("Application started.")
 ```

docs/webhook_guide.md

@@ -74,7 +74,7 @@ The SDK provides a `verify_signature` utility to validate the HMAC signature. He
 Example Code:
 
 ```python
-from src.sdk.utils.validators import verify_signature
+from src.common.validators import verify_signature
 
 try:
     verify_signature(message=raw_payload, signature=auth_header, secret=WEBHOOK_SECRET)

src/sdk/utils/exceptions.py → src/common/exceptions.py

@@ -1,4 +1,4 @@
-from ..utils.logger import logger
+from .logger import logger
 
 
 class ApiError(Exception):

src/sdk/utils/retry.py → src/common/retry.py

@@ -1,7 +1,7 @@
 import time
 from functools import wraps
-from ..utils.logger import logger
-from ..utils.exceptions import TransientError
+from .logger import logger
+from .exceptions import TransientError
 
 
 def retry(max_retries: int = 3, backoff: int = 2, retry_on: tuple = (502, 503)):

src/sdk/utils/validators.py → src/common/validators.py

@@ -5,7 +5,7 @@
 from pydantic import ValidationError
 from functools import wraps
 from typing import Any, Callable
-from ..utils.logger import logger
+from .logger import logger
 
 
 def validate_request(model: Any):

src/sdk/client.py

@@ -1,10 +1,10 @@
 import requests
 from typing import Any
 from config import settings
-from .utils.logger import logger
-from .utils.requests import handle_request_errors
-from .utils.exceptions import UnauthorizedError, NotFoundError, ServerError, ApiError, TransientError
-from .utils.retry import retry
+from src.common.logger import logger
+from ..common.requests import handle_request_errors
+from ..common.exceptions import UnauthorizedError, NotFoundError, ServerError, ApiError, TransientError
+from ..common.retry import retry
 
 
 class ApiClient:

src/sdk/features/contacts.py

@@ -1,9 +1,9 @@
 from typing import Dict, List
 from ..client import ApiClient
 from ..schemas.contacts import CreateContactRequest, Contact, ListContactsResponse
-from ..utils.validators import validate_request, validate_response
-from ..utils.exceptions import handle_exceptions
-from ..utils.logger import logger
+from src.common.validators import validate_request, validate_response
+from src.common.exceptions import handle_exceptions
+from src.common.logger import logger
 
 
 class Contacts:

src/sdk/features/messages.py

@@ -1,10 +1,10 @@
 from typing import Dict, List
 from ..client import ApiClient
 from ..schemas.messages import CreateMessageRequest, Message, ListMessagesResponse
-from ..utils.validators import validate_request, validate_response
-from ..utils.exceptions import handle_exceptions
-from ..utils.logger import logger
-from ..utils.validators import verify_signature
+from src.common.validators import validate_request, validate_response
+from src.common.exceptions import handle_exceptions
+from src.common.logger import logger
+from src.common.validators import verify_signature
 
 
 class Messages:

src/server/app.py

@@ -5,8 +5,8 @@
 from ..sdk.client import ApiClient
 from .schemas import WebhookPayload
 from ..sdk.features.messages import Messages
-from ..sdk.utils.validators import verify_signature
-from src.sdk.utils.logger import webhook_logger as logger
+from src.common.validators import verify_signature
+from src.common.logger import webhook_logger as logger
 
 # Initialize FastAPI app
 app = FastAPI()
@@ -19,7 +19,7 @@
 
 @app.post("/webhooks")
 async def handle_webhook(
-    payload: WebhookPayload,  # Ensure FastAPI uses this schema for validation
+    payload: WebhookPayload,
     authorization: str = Header(...),
     request: Request = None,
 ):

tests/integration/test_contacts_integration.py → tests/integration/sdk/test_contacts_integration.py

@@ -1,5 +1,5 @@
 import pytest
-from src.sdk.utils.exceptions import NotFoundError
+from src.common.exceptions import NotFoundError
 
 
 def test_create_contact_success(contacts, mock_api_client):

tests/integration/test_messages_integration.py → tests/integration/sdk/test_messages_integration.py

@@ -1,5 +1,5 @@
 import pytest
-from src.sdk.utils.exceptions import ApiError, NotFoundError, UnauthorizedError
+from src.common.exceptions import ApiError, NotFoundError, UnauthorizedError
 
 def test_send_message_success(messages, mock_api_client):
     """

tests/integration/test_webhook.py → tests/integration/server/test_webhook.py

@@ -2,7 +2,7 @@
 from fastapi.testclient import TestClient
 from config import settings
 from src.server.app import app
-from src.sdk.utils.validators import generate_signature
+from src.common.validators import generate_signature
 
 client = TestClient(app)
 

tests/unit/test_sdk/test_client.py → tests/unit/sdk/test_client.py

@@ -1,7 +1,7 @@
 import pytest
 from unittest.mock import patch, MagicMock
 from src.sdk.client import ApiClient
-from src.sdk.utils.exceptions import UnauthorizedError, NotFoundError, ServerError, ApiError
+from src.common.exceptions import UnauthorizedError, NotFoundError, ServerError, ApiError
 from config import settings
 
 

tests/unit/test_sdk/test_contacts.py → tests/unit/sdk/test_contacts.py

@@ -2,7 +2,7 @@
 from unittest.mock import MagicMock, patch
 from src.sdk.features.contacts import Contacts
 from src.sdk.client import ApiClient
-from src.sdk.utils.exceptions import UnauthorizedError, NotFoundError, ApiError, PayloadValidationError
+from src.common.exceptions import UnauthorizedError, NotFoundError, ApiError, PayloadValidationError
 from src.sdk.schemas.contacts import CreateContactRequest
 
 

tests/unit/test_sdk/test_messages.py → tests/unit/sdk/test_messages.py

@@ -2,7 +2,7 @@
 from unittest.mock import MagicMock, patch
 from src.sdk.features.messages import Messages
 from src.sdk.client import ApiClient
-from src.sdk.utils.exceptions import UnauthorizedError, NotFoundError, ApiError, PayloadValidationError
+from src.common.exceptions import UnauthorizedError, NotFoundError, ApiError, PayloadValidationError
 from src.sdk.schemas.messages import CreateMessageRequest
 
 

tests/unit/test_server/test_route.py → tests/unit/server/test_route.py

@@ -4,7 +4,7 @@
 from src.server.app import app
 from config import settings
 
-from src.sdk.utils.validators import generate_signature
+from src.common.validators import generate_signature
 
 client = TestClient(app)
 

tests/unit/test_server/test_signature_validation.py → tests/unit/server/test_signature_validation.py

@@ -4,8 +4,8 @@
 import json
 
 from config import settings
-from src.sdk.utils.validators import verify_signature
-from src.sdk.utils.validators import generate_signature
+from src.common.validators import verify_signature
+from src.common.validators import generate_signature
 
 
 def test_valid_signature():