django-cfg 1.3.11__py3-none-any.whl → 1.4.0__py3-none-any.whl

django_cfg/modules/{django_ngrok.py → django_ngrok/service.py}

@@ -34,38 +34,34 @@ class NgrokManager:
         """Start ngrok tunnel for given port."""
         if not self.config.enabled:
             return None
-        
+
         try:
             # Import ngrok (may not be available on Python < 3.12)
             import ngrok
-            
+
             # Get auth token
-            authtoken = self.config.auth.get_authtoken()
-            
+            authtoken = self.config.get_authtoken()
+
             # Create tunnel configuration
             tunnel_config = {
                 "addr": f"http://127.0.0.1:{port}",
             }
-            
+
             # Add auth token if available
             if authtoken:
                 tunnel_config["authtoken"] = authtoken
-            
-            # Add domain if specified
-            if self.config.tunnel.domain:
-                tunnel_config["domain"] = self.config.tunnel.domain
-            
+
             # Add basic auth if specified
-            if self.config.tunnel.basic_auth:
-                tunnel_config["basic_auth"] = self.config.tunnel.basic_auth
-            
+            if self.config.basic_auth:
+                tunnel_config["basic_auth"] = self.config.basic_auth
+
             # Start tunnel
             self.listener = ngrok.forward(**tunnel_config)
             self.tunnel_url = self.listener.url()
-            
+
             logger.info(f"Ngrok tunnel started: {self.tunnel_url}")
             return self.tunnel_url
-            
+
         except ImportError:
             logger.warning("ngrok package not available. Requires Python 3.12+ or install with: pip install ngrok")
             return None
@@ -158,16 +154,8 @@ class DjangoNgrok(BaseCfgModule):
             return False
         return self.manager.is_active()
     
-    def get_webhook_url(self, path: Optional[str] = None) -> str:
+    def get_webhook_url(self, path: str = "/webhooks/") -> str:
         """Get webhook URL with ngrok tunnel or fallback to api_url."""
-        # Get path from config if not provided
-        if path is None:
-            config = self.get_config()
-            if config and hasattr(config, 'ngrok') and config.ngrok:
-                path = config.ngrok.webhook_path
-            else:
-                path = "/webhooks/"
-        
         # Try to get tunnel URL first
         try:
             tunnel_url = self.get_tunnel_url()
@@ -175,7 +163,7 @@ class DjangoNgrok(BaseCfgModule):
                 return f"{tunnel_url.rstrip('/')}/{path.lstrip('/')}"
         except Exception as e:
             logger.warning(f"Ngrok tunnel not available: {e}")
-        
+
         # Fallback to api_url from config
         try:
             config = self.get_config()
@@ -183,7 +171,7 @@ class DjangoNgrok(BaseCfgModule):
                 return f"{config.api_url.rstrip('/')}/{path.lstrip('/')}"
         except Exception as e:
             logger.warning(f"Failed to get config for webhook URL: {e}")
-        
+
         # Ultimate fallback
         return f"http://localhost:8000/{path.lstrip('/')}"
     
@@ -229,22 +217,6 @@ class DjangoNgrok(BaseCfgModule):
     def get_effective_tunnel_url(self) -> Optional[str]:
         """Get effective tunnel URL (alias for get_tunnel_url for clarity)."""
         return self.get_tunnel_url()
-    
-    def update_config_urls(self) -> None:
-        """Update config URLs with tunnel URL if tunnel is active and update_api_url is enabled."""
-        config = self.get_config()
-        if not config or not hasattr(config, 'ngrok') or not config.ngrok:
-            return
-        
-        # Only update if enabled in config
-        if not config.ngrok.update_api_url:
-            return
-        
-        tunnel_url = self.get_tunnel_url()
-        if tunnel_url:
-            # Update api_url with tunnel URL
-            config.api_url = tunnel_url
-            logger.info(f"Updated api_url to tunnel URL: {tunnel_url}")
 
 
 # Global instance for easy access

django_cfg/modules/django_rpc_old/POETRY.md

@@ -0,0 +1,344 @@
+# Poetry Setup & Dependencies - Django RPC Module
+
+**Status:** ✅ Ready to Use
+**All Dependencies:** ✅ Already Installed
+**Test Framework:** ✅ Working via Poetry
+
+---
+
+## Dependency Analysis
+
+### ✅ Required Dependencies (Already Installed)
+
+All dependencies for WebSocket RPC module are **already present** in `pyproject.toml`:
+
+```toml
+# Redis client (line 98-99)
+"redis>=6.4.0,<7.0"           # ✅ Redis Python client
+"hiredis>=2.0.0,<4.0"         # ✅ High-performance Redis protocol
+
+# Pydantic models (line 57-58)
+"pydantic>=2.11.0,<3.0"       # ✅ Pydantic 2 core
+"pydantic[email]>=2.11.0,<3.0" # ✅ Email validation extras
+
+# Testing (dev group)
+"pytest>=8.4,<9.0"            # ✅ Test framework
+"pytest-mock>=3.15,<4.0"      # ✅ Mock support
+```
+
+### 📦 No Additional Dependencies Needed
+
+**Important:** Do NOT add any new dependencies!
+
+The WebSocket RPC module uses:
+- ✅ Redis (already in core dependencies)
+- ✅ Pydantic 2 (already in core dependencies)
+- ✅ Standard library only (json, uuid, logging, threading)
+
+---
+
+## Running Tests via Poetry
+
+### Basic Commands
+
+```bash
+# Navigate to django-cfg directory
+cd libs/django_cfg
+
+# Run all WebSocket RPC tests
+poetry run pytest src/django_cfg/tests/websocket/ -v
+
+# Run with concise output
+poetry run pytest src/django_cfg/tests/websocket/ -q
+
+# Run specific test file
+poetry run pytest src/django_cfg/tests/websocket/test_models.py -v
+
+# Run specific test class
+poetry run pytest src/django_cfg/tests/websocket/test_client.py::TestRPCClientCall -v
+```
+
+### Using Test Markers
+
+```bash
+# Run only unit tests
+poetry run pytest src/django_cfg/tests/websocket/ -m "unit"
+
+# Run only model tests
+poetry run pytest src/django_cfg/tests/websocket/ -m "unit and models"
+
+# Run only client tests
+poetry run pytest src/django_cfg/tests/websocket/ -m "unit and client"
+```
+
+### Test Collection (Dry Run)
+
+```bash
+# Show what tests would run
+poetry run pytest src/django_cfg/tests/websocket/ --co -q
+
+# Show with markers filter
+poetry run pytest src/django_cfg/tests/websocket/ -m "models" --co -q
+```
+
+---
+
+## Poetry vs Direct Python
+
+### ❌ Don't Use PYTHONPATH Manually
+
+```bash
+# ❌ Old way (manual PYTHONPATH)
+PYTHONPATH=src:$PYTHONPATH pytest src/django_cfg/tests/websocket/
+
+# ✅ Better way (poetry handles paths)
+poetry run pytest src/django_cfg/tests/websocket/
+```
+
+### Why Poetry?
+
+Poetry automatically:
+- ✅ Sets correct PYTHONPATH
+- ✅ Uses virtual environment (.venv)
+- ✅ Manages dependencies
+- ✅ Isolates from system Python
+
+---
+
+## Current Test Results
+
+### Via Poetry
+
+```bash
+$ poetry run pytest src/django_cfg/tests/websocket/ -q
+
+src/django_cfg/tests/websocket/test_client.py ..................    [ 40%]
+src/django_cfg/tests/websocket/test_models.py ..........................  [100%]
+
+======================== 44 passed in 0.20s ========================
+```
+
+### Test Breakdown
+
+| Category | Count | Marker | Status |
+|----------|-------|--------|--------|
+| Model tests | 26 | `unit and models` | ✅ PASS |
+| Client tests | 18 | `unit and client` | ✅ PASS |
+| **Total** | **44** | `unit` | **✅ PASS** |
+
+### Performance
+
+- **Single test:** ~0.005s
+- **Full suite:** ~0.20s
+- **Meets target:** < 0.1s per test ✅
+
+---
+
+## Warnings Analysis
+
+Current warnings (from libraries, not our code):
+
+```
+1. PydanticDeprecatedSince20: `min_items` → `min_length`
+   Source: Pydantic library internal
+   Action: Ignore (library will fix)
+
+2. RemovedInDjango60Warning: URLField scheme change
+   Source: Django core
+   Action: Ignore (Django-specific)
+
+3. DeprecationWarning: datetime.utcnow()
+   Source: Pydantic library internal
+   Action: Ignore (our code uses datetime.now(timezone.utc) ✅)
+```
+
+**Our code is clean** - all warnings come from dependencies, not from WebSocket RPC module.
+
+---
+
+## Development Workflow
+
+### Install Development Dependencies
+
+```bash
+cd libs/django_cfg
+
+# Install all dev dependencies
+poetry install --with dev
+
+# Or specific groups
+poetry install --with dev,test,docs
+```
+
+### Add New Dependency (If Needed)
+
+```bash
+# Add to main dependencies
+poetry add package-name
+
+# Add to dev dependencies
+poetry add --group dev package-name
+
+# Add to test dependencies
+poetry add --group test package-name
+```
+
+**For WebSocket RPC:** No new dependencies needed!
+
+### Update Dependencies
+
+```bash
+# Update all dependencies
+poetry update
+
+# Update specific package
+poetry update redis
+
+# Show outdated packages
+poetry show --outdated
+```
+
+---
+
+## Project Structure
+
+```
+libs/django_cfg/
+├── pyproject.toml              # ✅ Poetry configuration
+├── poetry.lock                 # ✅ Locked versions
+├── .venv/                      # ✅ Virtual environment
+├── src/django_cfg/
+│   ├── models/websocket/       # Pydantic models
+│   ├── modules/django_rpc/     # RPC client
+│   └── tests/websocket/        # Unit tests
+└── tests/                      # Integration tests
+```
+
+---
+
+## pyproject.toml Key Sections
+
+### Build System
+
+```toml
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+```
+
+Uses **hatchling** but supports Poetry for development.
+
+### Core Dependencies
+
+```toml
+[project]
+dependencies = [
+    "redis>=6.4.0,<7.0",        # WebSocket RPC ✅
+    "pydantic>=2.11.0,<3.0",    # WebSocket RPC ✅
+    # ... other dependencies
+]
+```
+
+### Poetry Dev Group
+
+```toml
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.4.2"
+pytest-django = "^4.11.1"
+pytest-mock = "^3.14.1"
+# ... other dev tools
+```
+
+---
+
+## Common Issues
+
+### Issue: `poetry: command not found`
+
+**Solution:** Install Poetry
+
+```bash
+curl -sSL https://install.python-poetry.org | python3 -
+```
+
+### Issue: Virtual environment not found
+
+**Solution:** Create virtual environment
+
+```bash
+cd libs/django_cfg
+poetry install
+```
+
+### Issue: Tests can't import django_cfg
+
+**Solution:** Always use `poetry run`
+
+```bash
+# ❌ Wrong
+pytest src/django_cfg/tests/websocket/
+
+# ✅ Correct
+poetry run pytest src/django_cfg/tests/websocket/
+```
+
+### Issue: Module 'redis' not found
+
+**Solution:** Install dependencies
+
+```bash
+poetry install --with dev,test
+```
+
+---
+
+## CI/CD Integration
+
+### GitHub Actions
+
+```yaml
+- name: Install dependencies
+  run: |
+    cd libs/django_cfg
+    poetry install --with dev,test
+
+- name: Run WebSocket RPC tests
+  run: |
+    cd libs/django_cfg
+    poetry run pytest src/django_cfg/tests/websocket/ -v
+```
+
+### Pre-commit Hook
+
+```yaml
+# .pre-commit-config.yaml
+- repo: local
+  hooks:
+    - id: pytest-websocket
+      name: WebSocket RPC Tests
+      entry: bash -c 'cd libs/django_cfg && poetry run pytest src/django_cfg/tests/websocket/ -q'
+      language: system
+      pass_filenames: false
+```
+
+---
+
+## Summary
+
+✅ **All dependencies installed**
+✅ **Tests working via Poetry**
+✅ **44/44 tests passing**
+✅ **Performance excellent (~0.2s)**
+✅ **No manual PYTHONPATH needed**
+✅ **Ready for production**
+
+**Next Steps:**
+- Continue development using `poetry run`
+- No new dependencies needed
+- All tools ready to use
+
+---
+
+**Last Updated:** 2025-10-03
+**Maintainer:** Django-CFG Team
+**Status:** ✅ Production Ready