django-cfg 1.4.15__py3-none-any.whl → 1.4.17__py3-none-any.whl

django_cfg/apps/leads/urls.py

@@ -8,8 +8,9 @@ from rest_framework.routers import DefaultRouter
 from .views import LeadViewSet
 
 # Create router
+# Note: Empty prefix because URL is already under cfg/leads/
 router = DefaultRouter()
-router.register(r"leads", LeadViewSet, basename="lead")
+router.register(r"", LeadViewSet, basename="lead")
 
 app_name = "cfg_leads"
 

django_cfg/apps/payments/urls.py

@@ -22,7 +22,7 @@ app_name = 'cfg_payments'
 
 # Main router for global endpoints
 router = DefaultRouter()
-router.register(r'payments', PaymentViewSet, basename='payment')
+router.register(r'payment', PaymentViewSet, basename='payment')
 router.register(r'balances', UserBalanceViewSet, basename='balance')
 router.register(r'transactions', TransactionViewSet, basename='transaction')
 router.register(r'currencies', CurrencyViewSet, basename='currency')
@@ -38,7 +38,7 @@ users_router = routers.SimpleRouter()
 users_router.register(r'users', UserPaymentViewSet, basename='user') # Base for nesting
 
 payments_router = routers.NestedSimpleRouter(users_router, r'users', lookup='user')
-payments_router.register(r'payments', UserPaymentViewSet, basename='user-payment')
+payments_router.register(r'payment', UserPaymentViewSet, basename='user-payment')
 
 subscriptions_router = routers.NestedSimpleRouter(users_router, r'users', lookup='user')
 subscriptions_router.register(r'subscriptions', UserSubscriptionViewSet, basename='user-subscription')
@@ -57,8 +57,8 @@ urlpatterns = [
     path('', include(apikeys_router.urls)),
     
     # Custom API endpoints
-    path('payments/create/', PaymentCreateView.as_view(), name='payment-create'),
-    path('payments/status/<uuid:pk>/', PaymentStatusView.as_view(), name='payment-status'),
+    path('payment/create/', PaymentCreateView.as_view(), name='payment-create'),
+    path('payment/status/<uuid:pk>/', PaymentStatusView.as_view(), name='payment-status'),
     
     # Note: currencies/convert/ is handled by CurrencyViewSet action
     # path('currencies/convert/', CurrencyConversionView.as_view(), name='currency-convert'),

django_cfg/core/base/config_model.py

@@ -483,14 +483,14 @@ class DjangoConfig(BaseModel):
         """
         Get the base directory of the project.
 
-        Looks for manage.py in current directory and parents.
+        Looks for manage.py starting from current working directory and going up.
         Falls back to current working directory if not found.
+        
+        This ensures we find the Django project root, not the django-cfg package location.
         """
         if self._base_dir is None:
-            import os
-
-            # Start from current working directory
-            current_path = Path(os.path.dirname(os.path.abspath(__file__)))
+            # Start from current working directory (where Django runs)
+            current_path = Path.cwd().resolve()
 
             # Look for manage.py in current directory and parents
             for path in [current_path] + list(current_path.parents):
@@ -499,9 +499,9 @@ class DjangoConfig(BaseModel):
                     self._base_dir = path
                     break
 
-            # If still not found, use current directory
+            # If still not found, use current working directory
             if self._base_dir is None:
-                self._base_dir = Path.cwd()
+                self._base_dir = current_path
 
         return self._base_dir
 

django_cfg/core/generation/core_generators/settings.py

@@ -77,9 +77,8 @@ class CoreSettingsGenerator:
             # Auto-use django-cfg accounts CustomUser if accounts is enabled
             settings["AUTH_USER_MODEL"] = "django_cfg_accounts.CustomUser"
 
-        # Add base directory
-        if self.config._base_dir:
-            settings["BASE_DIR"] = self.config._base_dir
+        # Add base directory (always set, auto-detects from manage.py location)
+        settings["BASE_DIR"] = self.config.base_dir
 
         # Add default auto field
         settings["DEFAULT_AUTO_FIELD"] = "django.db.models.BigAutoField"

django_cfg/core/generation/core_generators/static.py

@@ -60,15 +60,15 @@ class StaticFilesGenerator:
             "WHITENOISE_MAX_AGE": 0 if self.config.debug else 3600,  # No cache in debug, 1 hour in prod
         }
 
-        # Set paths relative to base directory
-        if self.config._base_dir:
-            settings.update({
-                "STATIC_ROOT": self.config._base_dir / "staticfiles",
-                "MEDIA_ROOT": self.config._base_dir / "media",
-                "STATICFILES_DIRS": [
-                    self.config._base_dir / "static",
-                ],
-            })
+        # Set paths relative to base directory (always set, auto-detects from manage.py)
+        base_dir = self.config.base_dir
+        settings.update({
+            "STATIC_ROOT": base_dir / "staticfiles",
+            "MEDIA_ROOT": base_dir / "media",
+            "STATICFILES_DIRS": [
+                base_dir / "static",
+            ],
+        })
 
         # Static files finders
         settings["STATICFILES_FINDERS"] = [

django_cfg/core/generation/integration_generators/api.py

@@ -112,7 +112,7 @@ class APIFrameworksGenerator:
 
             # Build REST_FRAMEWORK settings
             rest_framework = {
-                "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
+                "DEFAULT_SCHEMA_CLASS": "django_cfg.modules.django_client.spectacular.schema.PathBasedAutoSchema",
                 "DEFAULT_PAGINATION_CLASS": "django_cfg.middleware.pagination.DefaultPagination",
                 "PAGE_SIZE": 100,
                 "DEFAULT_RENDERER_CLASSES": [

django_cfg/models/infrastructure/security.py

@@ -80,11 +80,42 @@ class SecurityConfig(BaseConfig):
         self.session_cookie_secure = True
     
     def configure_for_development(self) -> None:
-        """Configure security settings for development."""
+        """
+        Configure security settings for development.
+        
+        In development:
+        - CORS allows all origins for convenience
+        - CSRF requires explicit trusted origins (CORS setting doesn't affect CSRF)
+        - Adds common dev ports + existing csrf_trusted_origins
+        """
         self.cors_allow_all_origins = True
         self.cors_allowed_origins = []
         self.csrf_cookie_secure = False
-        self.csrf_trusted_origins = []
+        
+        # Common development origins for CSRF
+        # Note: CORS_ALLOW_ALL_ORIGINS doesn't affect CSRF - it needs explicit origins
+
+        # function smart diapason for dev ports
+        def smart_diapason(start: int, end: int) -> List[str]:
+            return [f'http://localhost:{i}' for i in range(start, end)]
+        
+        dev_local_origins = [
+            'http://localhost:3000',
+            'http://localhost:8000',
+            'http://127.0.0.1:3000',
+            'http://127.0.0.1:8000',
+        ] + smart_diapason(3000, 3010) + smart_diapason(8000, 8010)
+        
+        # Combine dev defaults with existing trusted origins (from security_domains)
+        # Remove duplicates while preserving order
+        combined = dev_local_origins + self.csrf_trusted_origins
+        
+        # unique and sorted
+        combined_unique = list(dict.fromkeys(combined))
+        combined_unique.sort()
+
+        self.csrf_trusted_origins = combined_unique
+        
         self.ssl_redirect = False
         self.hsts_enabled = False
         self.session_cookie_secure = False

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

@@ -208,7 +208,7 @@ class BaseGenerator(ABC):
         Extract Django app name from URL path.
 
         Args:
-            path: URL path (e.g., "/django_cfg_leads/leads/", "/django_cfg_newsletter/campaigns/")
+            path: URL path (e.g., "/django_cfg_leads/leads/", "/django_cfg_newsletter/campaigns/", "/cfg/accounts/otp/")
 
         Returns:
             App name without trailing slash, or None if no app detected
@@ -220,10 +220,16 @@ class BaseGenerator(ABC):
             'django_cfg_newsletter'
             >>> generator.extract_app_from_path("/api/users/")
             'api'
+            >>> generator.extract_app_from_path("/cfg/accounts/otp/")
+            'accounts'
         """
         # Remove leading/trailing slashes and split
         parts = path.strip('/').split('/')
 
+        # For cfg group URLs (/cfg/accounts/, /cfg/support/), skip the 'cfg' prefix
+        if len(parts) >= 2 and parts[0] == 'cfg':
+            return parts[1]
+
         # First part is usually the app name
         if parts:
             return parts[0]
@@ -396,26 +402,15 @@ class BaseGenerator(ABC):
             'retrieve'  # No prefix to remove
         """
         from django.utils.text import slugify
+        import re
 
         # First, strip common app label prefixes from operation_id
-        # This handles cases like "django_cfg_newsletter_campaigns_list"
-        cleaned_op_id = operation_id
-        app_prefixes_to_strip = [
-            'django_cfg_newsletter_',
-            'django_cfg_accounts_',
-            'django_cfg_leads_',
-            'django_cfg_support_',
-            'django_cfg_agents_',
-            'django_cfg_knowbase_',
-            'django_cfg_payments_',
-            'django_cfg_tasks_',
-            'django_cfg_',  # Catch-all for any django_cfg_* prefixes
-        ]
-
-        for app_prefix in app_prefixes_to_strip:
-            if cleaned_op_id.startswith(app_prefix):
-                cleaned_op_id = cleaned_op_id[len(app_prefix):]
-                break
+        # This handles cases like "django_cfg_newsletter_campaigns_list" or "cfg_support_tickets_list"
+        # Remove only the cfg/django_cfg prefix, not the entire app name
+        # Examples:
+        #   cfg_support_tickets_list → support_tickets_list
+        #   django_cfg_accounts_otp_request → accounts_otp_request
+        cleaned_op_id = re.sub(r'^(django_)?cfg_', '', operation_id)
 
         # Now try to remove the normalized tag as a prefix
         # Normalize tag same way as tag_to_property_name but without adding group prefix
@@ -432,7 +427,10 @@ class BaseGenerator(ABC):
         # Strip leading underscores from tag
         normalized_tag = normalized_tag.lstrip('_')
 
-        # Try to remove normalized tag as prefix
+        # Remove tag prefix from operation_id if it matches
+        # This ensures methods in each API folder have clean, contextual names
+        # e.g., in cfg__support: "support_tickets_list" → "tickets_list"
+        # e.g., in cfg__accounts: "accounts_otp_request" → "otp_request"
         tag_prefix = f"{normalized_tag}_"
         if cleaned_op_id.startswith(tag_prefix):
             cleaned_op_id = cleaned_op_id[len(tag_prefix):]

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

@@ -13,6 +13,7 @@ from __future__ import annotations
 from jinja2 import Environment
 from ..base import GeneratedFile, BaseGenerator
 from ...ir import IRContext, IROperationObject
+from .naming import operation_to_method_name
 
 
 class FetchersGenerator:
@@ -33,7 +34,7 @@ class FetchersGenerator:
 
     def generate_fetcher_function(self, operation: IROperationObject) -> str:
         """
-        Generate a single fetcher function for an operation.
+        Generate a single fetcher function for an operation using Jinja2 template.
 
         Args:
             operation: IROperationObject to convert to fetcher
@@ -59,99 +60,60 @@ class FetchersGenerator:
 
         # Get API client call
         api_call = self._get_api_call(operation)
-
-        # Build JSDoc comment
-        jsdoc = self._generate_jsdoc(operation, func_name)
-
-        # Build function
-        lines = []
-
-        # JSDoc
-        if jsdoc:
-            lines.append(jsdoc)
-
-        # Function signature with optional client parameter
-        if param_info['func_params']:
-            lines.append(f"export async function {func_name}(")
-            lines.append(f"  {param_info['func_params']},")
-            lines.append(f"  client?: API")
-            lines.append(f"): Promise<{response_type}> {{")
-        else:
-            lines.append(f"export async function {func_name}(")
-            lines.append(f"  client?: API")
-            lines.append(f"): Promise<{response_type}> {{")
-
-        # Get client instance (either passed or global)
-        lines.append("  const api = client || getAPIInstance()")
-        lines.append("")
-
-        # Function body - build API call
-        api_call_params = param_info['api_call_params']
-        # Replace API. with api.
+        # Replace API. with api. for instance method
         api_call_instance = api_call.replace("API.", "api.")
 
-        if api_call_params:
-            lines.append(f"  const response = await {api_call_instance}({api_call_params})")
-        else:
-            lines.append(f"  const response = await {api_call_instance}()")
-
-        # Validation with Zod
-        if response_schema:
-            lines.append(f"  return {response_schema}.parse(response)")
-        else:
-            lines.append("  return response")
-
-        lines.append("}")
-
-        return "\n".join(lines)
+        # Render template
+        template = self.jinja_env.get_template('fetchers/function.ts.jinja')
+        return template.render(
+            operation=operation,
+            func_name=func_name,
+            func_params=param_info['func_params'],
+            response_type=response_type,
+            response_schema=response_schema,
+            api_call=api_call_instance,
+            api_call_params=param_info['api_call_params']
+        )
 
     def _operation_to_function_name(self, operation: IROperationObject) -> str:
         """
         Convert operation to function name.
-
+        
+        Fetchers are organized into tag-specific files but also exported globally,
+        so we include the tag in the name to avoid collisions.
+        
         Examples:
-            users_list (GET) -> getUsersList
-            users_retrieve (GET) -> getUsersById
-            users_create (POST) -> createUsers
-            users_update (PUT) -> updateUsers
-            users_partial_update (PATCH) -> partialUpdateUsers
-            users_destroy (DELETE) -> deleteUsers
+            cfg_support_tickets_list -> getSupportTicketsList
+            cfg_health_drf_retrieve -> getHealthDrf
+            cfg_accounts_otp_request_create -> createAccountsOtpRequest
+            cfg_accounts_profile_partial_update (PUT) -> partialUpdateAccountsProfilePut
         """
-        # Remove tag prefix from operation_id
-        op_id = operation.operation_id
-
-        # Handle common patterns - keep full resource name for uniqueness
-        if op_id.endswith("_list"):
-            resource = op_id.removesuffix("_list")
-            return f"get{self._to_pascal_case(resource)}List"
-        elif op_id.endswith("_retrieve"):
-            resource = op_id.removesuffix("_retrieve")
-            # Add ById suffix to distinguish from list
-            return f"get{self._to_pascal_case(resource)}ById"
-        elif op_id.endswith("_create"):
-            resource = op_id.removesuffix("_create")
-            return f"create{self._to_pascal_case(resource)}"
-        elif op_id.endswith("_partial_update"):
-            resource = op_id.removesuffix("_partial_update")
-            return f"partialUpdate{self._to_pascal_case(resource)}"
-        elif op_id.endswith("_update"):
-            resource = op_id.removesuffix("_update")
-            return f"update{self._to_pascal_case(resource)}"
-        elif op_id.endswith("_destroy"):
-            resource = op_id.removesuffix("_destroy")
-            return f"delete{self._to_pascal_case(resource)}"
+        
+        
+        # Remove cfg_ prefix but keep tag + resource for uniqueness
+        operation_id = operation.operation_id
+        # Remove only cfg_/django_cfg_ prefix
+        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 = 'get'
+        elif operation.http_method == 'POST':
+            prefix = 'create'
+        elif operation.http_method in ('PUT', 'PATCH'):
+            if '_partial_update' in operation_id:
+                prefix = 'partialUpdate'
+            else:
+                prefix = 'update'
+        elif operation.http_method == 'DELETE':
+            prefix = 'delete'
         else:
-            # Custom action - use operation_id as is
-            return self._to_camel_case(op_id)
-
-    def _to_pascal_case(self, snake_str: str) -> str:
-        """Convert snake_case to PascalCase."""
-        return ''.join(word.capitalize() for word in snake_str.split('_'))
-
-    def _to_camel_case(self, snake_str: str) -> str:
-        """Convert snake_case to camelCase."""
-        components = snake_str.split('_')
-        return components[0] + ''.join(x.capitalize() for x in components[1:])
+            prefix = ''
+        
+        return operation_to_method_name(operation_id, operation.http_method, prefix, self.base)
 
     def _get_param_structure(self, operation: IROperationObject) -> dict:
         """
@@ -321,46 +283,27 @@ class FetchersGenerator:
     def _get_api_call(self, operation: IROperationObject) -> str:
         """
         Get API client method call path.
+        
+        Must match the naming logic in operations_generator to ensure correct method calls.
 
         Examples:
             API.users.list
             API.users.retrieve
             API.posts.create
+            API.accounts.otpRequest (custom action)
         """
-        # Get tag/resource name
+        
+        
         tag = operation.tags[0] if operation.tags else "default"
         tag_property = self.base.tag_to_property_name(tag)
 
-        # Get method name from operation_id
-        method_name = self.base.remove_tag_prefix(operation.operation_id, tag)
-        method_name = self._to_camel_case(method_name)
+        # Get method name using same logic as client generation (empty prefix)
+        operation_id = self.base.remove_tag_prefix(operation.operation_id, tag)
+        # Pass path to distinguish custom actions
+        method_name = operation_to_method_name(operation_id, operation.http_method, '', self.base, operation.path)
 
         return f"API.{tag_property}.{method_name}"
 
-    def _generate_jsdoc(self, operation: IROperationObject, func_name: str) -> str:
-        """Generate JSDoc comment for function."""
-        lines = ["/**"]
-
-        # Summary
-        if operation.summary:
-            lines.append(f" * {operation.summary}")
-        else:
-            lines.append(f" * {func_name}")
-
-        # Description
-        if operation.description:
-            lines.append(" *")
-            for desc_line in operation.description.split("\n"):
-                lines.append(f" * {desc_line}")
-
-        # HTTP method and path
-        lines.append(" *")
-        lines.append(f" * @method {operation.http_method}")
-        lines.append(f" * @path {operation.path}")
-
-        lines.append(" */")
-        return "\n".join(lines)
-
     def generate_tag_fetchers_file(
         self,
         tag: str,