django-cfg 1.4.21__py3-none-any.whl → 1.4.24__py3-none-any.whl

django_cfg/modules/django_client/core/generator/python/operations_generator.py

@@ -131,7 +131,7 @@ class OperationsGenerator:
         if return_type != "None":
             if operation.is_list_operation:
                 # Paginated list response - extract results
-                body_lines.append(f"data = response.json()")
+                body_lines.append("data = response.json()")
                 body_lines.append(f'return [{primary_response.schema_name}.model_validate(item) for item in data.get("results", [])]')
             else:
                 body_lines.append(f"return {primary_response.schema_name}.model_validate(response.json())")
@@ -249,7 +249,7 @@ class OperationsGenerator:
             if operation.is_list_operation:
                 # List response - validate each item (paginated)
                 primary_schema = primary_response.schema_name
-                body_lines.append(f"data = response.json()")
+                body_lines.append("data = response.json()")
                 body_lines.append(f'return [{primary_schema}.model_validate(item) for item in data.get("results", [])]')
             else:
                 # Single object response

django_cfg/modules/django_client/core/generator/python/sync_client_gen.py

@@ -11,8 +11,8 @@ from __future__ import annotations
 
 from jinja2 import Environment
 
-from ..base import GeneratedFile
 from ...ir import IROperationObject
+from ..base import GeneratedFile
 
 
 class SyncClientGenerator:

django_cfg/modules/django_client/core/generator/typescript/client_generator.py

@@ -5,9 +5,11 @@ TypeScript Client Generator - Generates TypeScript APIClient classes.
 from __future__ import annotations
 
 from jinja2 import Environment
+
 from ...ir import IROperationObject
 from ..base import GeneratedFile
 
+
 class ClientGenerator:
     """Generates TypeScript APIClient classes (flat and namespaced)."""
 
@@ -19,7 +21,7 @@ class ClientGenerator:
 
     def generate_client_file(self):
         """Generate client.ts with APIClient class."""
-        
+
 
         # Client class
         client_code = self._generate_client_class()

django_cfg/modules/django_client/core/generator/typescript/fetchers_generator.py

@@ -11,8 +11,9 @@ This generator creates universal TypeScript functions that:
 from __future__ import annotations
 
 from jinja2 import Environment
-from ..base import GeneratedFile, BaseGenerator
+
 from ...ir import IRContext, IROperationObject
+from ..base import BaseGenerator, GeneratedFile
 from .naming import operation_to_method_name
 
 
@@ -88,8 +89,8 @@ class FetchersGenerator:
             cfg_accounts_otp_request_create -> createAccountsOtpRequest
             cfg_accounts_profile_partial_update (PUT) -> partialUpdateAccountsProfilePut
         """
-        
-        
+
+
         # Remove cfg_ prefix but keep tag + resource for uniqueness
         operation_id = operation.operation_id
         # Remove only cfg_/django_cfg_ prefix
@@ -97,7 +98,7 @@ class FetchersGenerator:
             operation_id = operation_id.replace('django_cfg_', '', 1)
         elif operation_id.startswith('cfg_'):
             operation_id = operation_id.replace('cfg_', '', 1)
-        
+
         # Determine prefix based on HTTP method
         if operation.http_method == 'GET':
             prefix = 'get'
@@ -112,7 +113,7 @@ class FetchersGenerator:
             prefix = 'delete'
         else:
             prefix = ''
-        
+
         return operation_to_method_name(operation_id, operation.http_method, prefix, self.base)
 
     def _get_param_structure(self, operation: IROperationObject) -> dict:
@@ -164,7 +165,7 @@ class FetchersGenerator:
         if operation.request_body:
             # Check if this is a file upload operation
             is_multipart = operation.request_body.content_type == "multipart/form-data"
-            
+
             if is_multipart:
                 # For multipart, unpack data properties to match client signature
                 schema_name = operation.request_body.schema_name
@@ -176,19 +177,19 @@ class FetchersGenerator:
                     # IMPORTANT: Order must match client - required first, then optional
                     required_props = []
                     optional_props = []
-                    
+
                     for prop_name, prop in schema.properties.items():
                         if prop_name in schema.required:
                             required_props.append(prop_name)
                         else:
                             optional_props.append(prop_name)
-                    
+
                     # Add required first, then optional (matches client signature)
                     for prop_name in required_props + optional_props:
                         api_call_params.append(f"data.{prop_name}")
                 else:
                     # Inline schema - use data as-is
-                    func_params.append(f"data: FormData")
+                    func_params.append("data: FormData")
                     api_call_params.append("data")
             else:
                 # JSON request body - pass data object
@@ -206,7 +207,7 @@ class FetchersGenerator:
                 func_params.append(f"data?: {schema_name}")
                 api_call_params.append("data")
             else:
-                func_params.append(f"data?: any")
+                func_params.append("data?: any")
                 api_call_params.append("data")
 
         # Query parameters (passed as params object, but unpacked when calling API)
@@ -332,8 +333,8 @@ class FetchersGenerator:
             API.posts.create
             API.accounts.otpRequest (custom action)
         """
-        
-        
+
+
         tag = operation.tags[0] if operation.tags else "default"
         tag_property = self.base.tag_to_property_name(tag)
 
@@ -378,7 +379,7 @@ class FetchersGenerator:
                 # Only add if schema exists in components (not inline)
                 if operation.request_body.schema_name in self.context.schemas:
                     schema_names.add(operation.request_body.schema_name)
-            
+
             # Add patch request body schemas
             if operation.patch_request_body and operation.patch_request_body.schema_name:
                 # Only add if schema exists in components (not inline)

django_cfg/modules/django_client/core/generator/typescript/files_generator.py

@@ -5,6 +5,7 @@ TypeScript Files Generator - Generates utility files (index, http, errors, logge
 from __future__ import annotations
 
 from jinja2 import Environment
+
 from ...ir import IROperationObject
 from ..base import GeneratedFile
 

django_cfg/modules/django_client/core/generator/typescript/generator.py

@@ -12,18 +12,18 @@ This generator creates a complete TypeScript API client from IR:
 from __future__ import annotations
 
 import pathlib
+
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
-from ..base import BaseGenerator, GeneratedFile
 from ...ir import IROperationObject, IRSchemaObject
-
-from .models_generator import ModelsGenerator
-from .operations_generator import OperationsGenerator
+from ..base import BaseGenerator, GeneratedFile
 from .client_generator import ClientGenerator
-from .files_generator import FilesGenerator
-from .schemas_generator import SchemasGenerator
 from .fetchers_generator import FetchersGenerator
+from .files_generator import FilesGenerator
 from .hooks_generator import HooksGenerator
+from .models_generator import ModelsGenerator
+from .operations_generator import OperationsGenerator
+from .schemas_generator import SchemasGenerator
 
 
 class TypeScriptGenerator(BaseGenerator):

django_cfg/modules/django_client/core/generator/typescript/hooks_generator.py

@@ -17,10 +17,12 @@ Architecture:
 from __future__ import annotations
 
 from jinja2 import Environment
+
+from ...ir import IRContext, IROperationObject
 from ..base import BaseGenerator, GeneratedFile
-from ...ir import IROperationObject, IRContext
 from .naming import operation_to_method_name
 
+
 class HooksGenerator:
     """
     SWR hooks generator for React.
@@ -132,14 +134,14 @@ class HooksGenerator:
             cfg_health_drf_retrieve -> useHealthDrf
             cfg_accounts_otp_request_create -> useCreateAccountsOtpRequest
         """
-        
+
         # Remove cfg_ prefix but keep tag + resource for uniqueness (same as fetchers)
         operation_id = operation.operation_id
         if operation_id.startswith('django_cfg_'):
             operation_id = operation_id.replace('django_cfg_', '', 1)
         elif operation_id.startswith('cfg_'):
             operation_id = operation_id.replace('cfg_', '', 1)
-        
+
         # Determine prefix based on HTTP method
         if operation.http_method == 'GET':
             prefix = 'use'
@@ -154,21 +156,21 @@ class HooksGenerator:
             prefix = 'useDelete'
         else:
             prefix = 'use'
-        
+
         # For hooks, path is not critical but pass for consistency
         return operation_to_method_name(operation_id, operation.http_method, prefix, self.base, operation.path)
 
     def _operation_to_fetcher_name(self, operation: IROperationObject) -> str:
         """Get corresponding fetcher function name (must match fetchers_generator logic)."""
-        
-        
+
+
         # Remove cfg_ prefix but keep tag + resource (must match fetchers_generator exactly)
         operation_id = operation.operation_id
         if operation_id.startswith('django_cfg_'):
             operation_id = operation_id.replace('django_cfg_', '', 1)
         elif operation_id.startswith('cfg_'):
             operation_id = operation_id.replace('cfg_', '', 1)
-        
+
         # Determine prefix (must match fetchers_generator exactly)
         if operation.http_method == 'GET':
             prefix = 'get'
@@ -183,7 +185,7 @@ class HooksGenerator:
             prefix = 'delete'
         else:
             prefix = ''
-        
+
         # Must match fetchers exactly, including path
         return operation_to_method_name(operation_id, operation.http_method, prefix, self.base, operation.path)
 
@@ -224,7 +226,7 @@ class HooksGenerator:
                 func_params.append(f"data?: {schema_name}")
                 fetcher_params.append("data")
             else:
-                func_params.append(f"data?: any")
+                func_params.append("data?: any")
                 fetcher_params.append("data")
 
         # Query parameters (must come AFTER request body to match fetcher signature!)
@@ -382,7 +384,7 @@ class HooksGenerator:
 
         # Get display name for documentation
         tag_display_name = self.base.tag_to_display_name(tag)
-        
+
         # Get tag file name for fetchers import
         folder_name = self.base.tag_and_app_to_folder_name(tag, operations)
         tag_file = folder_name

django_cfg/modules/django_client/core/generator/typescript/models_generator.py

@@ -5,6 +5,7 @@ TypeScript Models Generator - Generates TypeScript interfaces and enums.
 from __future__ import annotations
 
 from jinja2 import Environment
+
 from ...ir import IRSchemaObject
 from ..base import GeneratedFile
 
@@ -176,7 +177,7 @@ class ModelsGenerator:
         # - not required: add ? optional marker
         if schema.nullable:
             ts_type = f"{ts_type} | null"
-        
+
         optional_marker = "" if is_required else "?"
 
         # Comment

django_cfg/modules/django_client/core/generator/typescript/naming.py

@@ -4,7 +4,6 @@ Simple naming strategy for TypeScript code generation.
 Strategy: Use full operation_id, remove tag prefix, convert to camelCase/PascalCase.
 """
 
-import re
 
 
 def to_camel_case(s: str) -> str:
@@ -73,11 +72,11 @@ def operation_to_method_name(
     """
     # Remove tag prefix
     clean_id = remove_tag_prefix(operation_id)
-    
+
     # For client methods (no prefix): camelCase
     if not prefix:
         return to_camel_case(clean_id)
-    
+
     # For fetchers/hooks (with prefix): prefix + PascalCase
     return f"{prefix}{to_pascal_case(clean_id)}"
 

django_cfg/modules/django_client/core/generator/typescript/operations_generator.py

@@ -5,8 +5,10 @@ TypeScript Operations Generator - Generates TypeScript async operation methods.
 from __future__ import annotations
 
 from jinja2 import Environment
+
 from ...ir import IROperationObject
-from .naming import operation_to_method_name 
+from .naming import operation_to_method_name
+
 
 class OperationsGenerator:
     """Generates TypeScript async operation methods."""
@@ -18,8 +20,8 @@ class OperationsGenerator:
 
     def generate_operation(self, operation: IROperationObject, remove_tag_prefix: bool = False, in_subclient: bool = False) -> str:
         """Generate async method for operation."""
-        
-        
+
+
         # Get method name using universal logic
         # For client methods, we use empty prefix to get short names: list, create, retrieve
         operation_id = operation.operation_id
@@ -59,7 +61,7 @@ class OperationsGenerator:
                     # Add required params first, then optional (TypeScript requirement)
                     required_params = []
                     optional_params = []
-                    
+
                     for prop_name, prop in schema.properties.items():
                         # Check if it's a file field (format: binary)
                         if prop.format == "binary":
@@ -71,13 +73,13 @@ class OperationsGenerator:
                                 param_str = f"{prop_name}: {prop_type}"
                             else:
                                 param_str = f"{prop_name}?: {prop_type}"
-                        
+
                         # Separate required and optional
                         if prop_name in schema.required:
                             required_params.append(param_str)
                         else:
                             optional_params.append(param_str)
-                    
+
                     # Add required first, then optional
                     params.extend(required_params)
                     params.extend(optional_params)
@@ -167,7 +169,7 @@ class OperationsGenerator:
         if use_rest_params and query_params_list:
             # Extract parameters from args array
             path_params_count = len(operation.path_parameters)
-            
+
             # For multipart, body params are unpacked as individual fields
             if is_multipart and operation.request_body:
                 schema_name = operation.request_body.schema_name
@@ -178,7 +180,7 @@ class OperationsGenerator:
                     body_params_count = 1  # data: FormData
             else:
                 body_params_count = 1 if (operation.request_body or operation.patch_request_body) else 0
-            
+
             first_query_pos = path_params_count + body_params_count
 
             # Extract path parameters
@@ -223,7 +225,7 @@ class OperationsGenerator:
             if use_rest_params:
                 # Extract params from args array - handle both calling styles
                 path_params_count = len(operation.path_parameters)
-                
+
                 # For multipart, body params are unpacked as individual fields
                 if is_multipart and operation.request_body:
                     schema_name = operation.request_body.schema_name
@@ -234,7 +236,7 @@ class OperationsGenerator:
                         body_params_count = 1  # data: FormData
                 else:
                     body_params_count = 1 if (operation.request_body or operation.patch_request_body) else 0
-                
+
                 first_query_pos = path_params_count + body_params_count
 
                 body_lines.append("let params;")

django_cfg/modules/django_client/core/generator/typescript/schemas_generator.py

@@ -11,8 +11,9 @@ This generator creates Zod schemas for runtime validation:
 from __future__ import annotations
 
 from jinja2 import Environment
-from ..base import GeneratedFile, BaseGenerator
+
 from ...ir import IRContext, IRSchemaObject
+from ..base import BaseGenerator, GeneratedFile
 
 
 class SchemasGenerator:
@@ -123,7 +124,7 @@ class SchemasGenerator:
         # - not required: field can be undefined (use .optional())
         if schema.nullable:
             zod_type = f"{zod_type}.nullable()"
-        
+
         if not is_required:
             zod_type = f"{zod_type}.optional()"
 

django_cfg/modules/django_client/core/generator/typescript/templates/client/client.ts.jinja

@@ -88,6 +88,7 @@ export class APIClient {
       params?: Record<string, any>;
       body?: any;
       formData?: FormData;
+      headers?: Record<string, string>;
     }
   ): Promise<T> {
     // Wrap request in retry logic if configured
@@ -123,16 +124,19 @@ export class APIClient {
       params?: Record<string, any>;
       body?: any;
       formData?: FormData;
+      headers?: Record<string, string>;
     }
   ): Promise<T> {
     const url = new URL(path, this.baseUrl);
     const startTime = Date.now();
 
-    // Build headers
-    const headers: Record<string, string> = {};
+    // Build headers - start with custom headers from options
+    const headers: Record<string, string> = {
+      ...(options?.headers || {})
+    };
 
     // Don't set Content-Type for FormData (browser will set it with boundary)
-    if (!options?.formData) {
+    if (!options?.formData && !headers['Content-Type']) {
       headers['Content-Type'] = 'application/json';
     }
 
@@ -322,6 +326,7 @@ export class APIClient {
       params?: Record<string, any>;
       body?: any;
       formData?: FormData;
+      headers?: Record<string, string>;
     }
   ): Promise<T> {
     // Wrap request in retry logic if configured
@@ -343,15 +348,18 @@ export class APIClient {
       params?: Record<string, any>;
       body?: any;
       formData?: FormData;
+      headers?: Record<string, string>;
     }
   ): Promise<T> {
     const url = new URL(path, this.baseUrl);
 
-    // Build headers
-    const headers: Record<string, string> = {};
+    // Build headers - start with custom headers from options
+    const headers: Record<string, string> = {
+      ...(options?.headers || {})
+    };
 
     // Don't set Content-Type for FormData (browser will set it with boundary)
-    if (!options?.formData) {
+    if (!options?.formData && !headers['Content-Type']) {
       headers['Content-Type'] = 'application/json';
     }
 

django_cfg/modules/django_client/core/generator/typescript/templates/main_index.ts.jinja

@@ -167,20 +167,14 @@ export class API {
     this._client.request = async <T>(
       method: string,
       path: string,
-      options?: { params?: Record<string, any>; body?: any }
+      options?: { params?: Record<string, any>; body?: any; formData?: FormData; headers?: Record<string, string> }
     ): Promise<T> => {
-      const headers: Record<string, string> = {};
-
-      if (this._token) {
-        headers['Authorization'] = `Bearer ${this._token}`;
-      }
-
-      // Merge with existing options
+      // Merge Authorization header with existing headers
       const mergedOptions = {
         ...options,
         headers: {
-          ...(options as any)?.headers,
-          ...headers,
+          ...(options?.headers || {}),
+          ...(this._token ? { 'Authorization': `Bearer ${this._token}` } : {}),
         },
       };
 

django_cfg/modules/django_client/core/groups/__init__.py

@@ -4,8 +4,8 @@ Application Grouping Module.
 Smart grouping of Django apps into separate OpenAPI schemas.
 """
 
-from .manager import GroupManager
 from .detector import GroupDetector
+from .manager import GroupManager
 
 __all__ = [
     "GroupManager",

django_cfg/modules/django_client/core/groups/detector.py

@@ -7,7 +7,8 @@ Detects which Django apps belong to which groups, with wildcard support.
 import fnmatch
 import logging
 from typing import Dict, List, Set
-from ..config import OpenAPIConfig, OpenAPIGroupConfig
+
+from ..config import OpenAPIConfig
 
 logger = logging.getLogger(__name__)
 

django_cfg/modules/django_client/core/groups/manager.py

@@ -8,6 +8,7 @@ import logging
 import sys
 from types import ModuleType
 from typing import Dict, List, Optional
+
 from ..config import OpenAPIConfig
 from .detector import GroupDetector
 
@@ -205,7 +206,7 @@ class GroupManager:
 
         # Check if this is django-cfg built-in apps group
         is_django_cfg_group = all(
-            app_name.startswith("django_cfg.apps.") 
+            app_name.startswith("django_cfg.apps.")
             for app_name in apps
         )
 

django_cfg/modules/django_client/core/ir/schema.py

@@ -13,7 +13,7 @@ Key Features:
 
 from __future__ import annotations
 
-from typing import Any, Literal
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 

django_cfg/modules/django_client/core/parser/base.py

@@ -9,9 +9,7 @@ Version-specific logic (nullable handling, etc.) is delegated to subclasses.
 
 from __future__ import annotations
 
-import re
 from abc import ABC, abstractmethod
-from typing import Any
 
 from ..ir import (
     DjangoGlobalMetadata,

django_cfg/modules/django_client/core/parser/models/schema.py

@@ -9,7 +9,7 @@ Reference: https://spec.openapis.org/oas/v3.1.0#schema-object
 
 from __future__ import annotations
 
-from typing import Any, Literal
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 

django_cfg/modules/django_client/core/validation/__init__.py

@@ -8,8 +8,8 @@ to improve OpenAPI schema quality.
 from .checker import ValidationChecker
 from .fixer import SafeFixer
 from .reporter import IssueReporter
-from .safety import SafetyManager
 from .rules.base import Issue, Severity, ValidationRule
+from .safety import SafetyManager
 
 __all__ = [
     'ValidationChecker',

django_cfg/modules/django_client/core/validation/fixer.py

@@ -1,7 +1,6 @@
 """Safe auto-fixer with rollback support."""
 
-from pathlib import Path
-from typing import Dict, List, Any
+from typing import Any, Dict, List
 
 from .rules import Issue
 from .rules.type_hints import TypeHintRule

django_cfg/modules/django_client/core/validation/reporter.py

@@ -3,7 +3,7 @@
 import json
 from collections import defaultdict
 from pathlib import Path
-from typing import Dict, List, Any
+from typing import Any, Dict, List
 
 from .rules import Issue, Severity
 
@@ -90,7 +90,7 @@ class IssueReporter:
 
         stats = self._get_statistics(issues)
 
-        print(f"\n📊 Validation Summary")
+        print("\n📊 Validation Summary")
         print(f"   Total: {stats['total']} issue(s)")
         print(f"   Errors: {stats['by_severity']['error']} | "
               f"Warnings: {stats['by_severity']['warning']} | "

django_cfg/modules/django_client/core/validation/safety.py

@@ -9,11 +9,11 @@ Ensures all code modifications are:
 """
 
 import ast
+import logging
 import shutil
 from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Dict, List, Optional
-import logging
 
 logger = logging.getLogger(__name__)