Upload 2 files

adapter_layer.py

@@ -6,15 +6,16 @@ import traceback
 from typing import Dict, Any, Optional, List
 import importlib.util
 
-# Verify that dependencies are available (should already be installed)
+# Directly import the packages that are now installed
 try:
     import pydantic
     import codecarbon
-    print(f"Dependencies verified - pydantic: {pydantic.__version__}, codecarbon: {codecarbon.__version__}")
+    print(f"Successfully using installed dependencies - pydantic: {pydantic.__version__}, codecarbon: {codecarbon.__version__}")
 except ImportError as e:
-    print(f"CRITICAL: Missing dependency: {e}")
+    print(f"Error importing dependencies: {e}")
+    # No mocking anymore - let errors propagate if packages aren't available
 
-# Import dependency helpers - keep this simple
+# Import dependency helpers
 def is_module_available(module_name):
     try:
         importlib.util.find_spec(module_name)
@@ -27,7 +28,6 @@ logger = logging.getLogger(__name__)
 class WildnerveModelAdapter:
     """
     Adapter layer that interfaces between HF inference endpoints and the model.
-    Compatible with the original architecture while providing robust fallbacks.
     """
     
     def __init__(self, model_path: str):
@@ -91,73 +91,56 @@ class WildnerveModelAdapter:
             raise ImportError("No tokenizer could be initialized")
     
     def _initialize_model(self):
-        """Initialize the actual model"""
+        """Load actual model modules by file path to avoid import issues."""
         try:
-            # List all Python files in the model path for diagnostics
-            model_files = [f for f in os.listdir(self.model_path) if f.endswith('.py')]
-            logger.info(f"Found potential model files: {model_files}")
-            
-            # Check for actual model modules
-            model_modules = ["model_Combn", "model_Custm", "model_PrTr"]
+            # Read config to know which files to try
+            import json
+            cfg_path = os.path.join(self.model_path, "config.json")
+            with open(cfg_path, "r") as f:
+                cfg = json.load(f)
+            candidates = cfg.get("SELECTED_MODEL", [])
+        except Exception:
+            candidates = ["model_Combn.py", "model_Custm.py", "model_PrTr.py"]
+        
+        for filename in candidates:
+            fp = os.path.join(self.model_path, filename)
+            if not os.path.isfile(fp):
+                logger.info(f"Model file not found: {filename}")
+                continue
             
-            # Output detailed diagnostic info about available modules
-            for module_name in model_modules:
-                available = is_module_available(module_name)
-                logger.info(f"Module {module_name}: {'Available' if available else 'Not available'}")
+            # Load module from file
+            name = os.path.splitext(filename)[0]
+            spec = importlib.util.spec_from_file_location(name, fp)
+            module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(module)
+            logger.info(f"Loaded module from file: {filename}")
             
-            # Try to import and initialize each model module
-            for module_name in model_modules:
-                try:
-                    if is_module_available(module_name):
-                        logger.info(f"Importing module: {module_name}")
-                        module = importlib.import_module(module_name)
-                        
-                        # Look for model classes
-                        model_classes = [
-                            "Wildnerve_tlm01_Hybrid_Model", 
-                            "Wildnerve_tlm01"
-                        ]
-                        
-                        # Check all model classes in this module
-                        for class_name in model_classes:
-                            if hasattr(module, class_name):
-                                logger.info(f"Found model class: {class_name} in {module_name}")
-                                model_class = getattr(module, class_name)
-                                
-                                # Initialize the model
-                                logger.info(f"Initializing {class_name} from {module_name}")
-                                self.model = model_class(
-                                    vocab_size=30522,
-                                    specialization="general",
-                                    dataset_path=None,
-                                    model_name="bert-base-uncased",
-                                    embedding_dim=768,
-                                    num_heads=12,
-                                    hidden_dim=768,
-                                    num_layers=6,
-                                    output_size=768,
-                                    dropout=0.1,
-                                    max_seq_length=512,
-                                    pooling_mode="mean",
-                                    tokenizer=self.tokenizer
-                                )
-                                
-                                logger.info(f"Successfully created {class_name} from {module_name}")
-                                self.initialized = True
-                                return
-                except Exception as e:
-                    logger.warning(f"Failed to import or initialize from {module_name}: {e}")
-                    logger.warning(traceback.format_exc())
-            
-            # If no model was initialized, raise error
-            if self.model is None:
-                logger.error("No suitable model class found in any module")
-                raise ImportError("No suitable model class found")
-                
-        except Exception as e:
-            logger.error(f"Failed to initialize model: {e}")
-            logger.error(traceback.format_exc())
-            raise
+            # Look for target classes
+            for class_name in ["Wildnerve_tlm01_Hybrid_Model", "Wildnerve_tlm01"]:
+                if hasattr(module, class_name):
+                    model_cls = getattr(module, class_name)
+                    # instantiate
+                    self.model = model_cls(
+                        vocab_size=30522,
+                        specialization="general",
+                        dataset_path=None,
+                        model_name="bert-base-uncased",
+                        embedding_dim=768,
+                        num_heads=12,
+                        hidden_dim=768,
+                        num_layers=6,
+                        output_size=768,
+                        dropout=0.1,
+                        max_seq_length=512,
+                        pooling_mode="mean",
+                        tokenizer=self.tokenizer
+                    )
+                    self.initialized = True
+                    logger.info(f"Instantiated {class_name} from {filename}")
+                    return
+        
+        # If we reach here, no model loaded
+        raise ImportError("Failed to load any Wildnerve model module")
     
     def generate(self, prompt: str, **kwargs) -> str:
         """Generate a response to the prompt"""

requirements.txt

@@ -1,504 +1,7 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile requirements.in
-#
-aiofiles==24.1.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-aiohappyeyeballs==2.6.1
-    # via aiohttp
-aiohttp==3.11.18
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-    #   litellm
-aiosignal==1.3.2
-    # via aiohttp
-aiosqlite==0.21.0
-    # via crawl4ai
-amqp==5.3.1
-    # via kombu
-annotated-types==0.7.0
-    # via pydantic
-anyio==4.9.0
-    # via
-    #   httpx
-    #   openai
-    #   starlette
-    #   watchfiles
-arrow==1.3.0
-    # via
-    #   -r requirements.in
-    #   codecarbon
-attrs==25.3.0
-    # via
-    #   aiohttp
-    #   jsonschema
-    #   outcome
-    #   referencing
-    #   trio
-beautifulsoup4==4.13.4
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-billiard==4.2.1
-    # via celery
-brotli==1.1.0
-    # via crawl4ai
-celery[redis]==5.5.2
-    # via -r requirements.in
-certifi==2025.4.26
-    # via
-    #   httpcore
-    #   httpx
-    #   requests
-    #   selenium
-cffi==1.17.1
-    # via
-    #   cryptography
-    #   trio
-chardet==5.2.0
-    # via crawl4ai
-charset-normalizer==3.4.1
-    # via requests
-click==8.1.8
-    # via
-    #   celery
-    #   click-didyoumean
-    #   click-plugins
-    #   click-repl
-    #   codecarbon
-    #   crawl4ai
-    #   litellm
-    #   nltk
-    #   typer
-    #   uvicorn
-click-didyoumean==0.3.1
-    # via celery
-click-plugins==1.1.1
-    # via celery
-click-repl==0.3.0
-    # via celery
-codecarbon==3.0.0
-    # via -r requirements.in
-colorama==0.4.6
-    # via
-    #   -r requirements.in
-    #   click
-    #   crawl4ai
-    #   tqdm
-    #   uvicorn
-crawl4ai==0.6.2
-    # via -r requirements.in
-cryptography==44.0.2
-    # via
-    #   -r requirements.in
-    #   jwcrypto
-    #   pyopenssl
-cssselect==1.3.0
-    # via crawl4ai
-distro==1.9.0
-    # via openai
-einops>=0.6.0
-fake-http-header==0.3.5
-    # via tf-playwright-stealth
-fake-useragent==2.2.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-fastapi==0.115.12
-    # via -r requirements.in
-fief-client[cli]==0.20.0
-    # via codecarbon
-filelock==3.18.0
-    # via
-    #   huggingface-hub
-    #   torch
-    #   transformers
-frozenlist==1.6.0
-    # via
-    #   aiohttp
-    #   aiosignal
-fsspec==2025.3.2
-    # via
-    #   huggingface-hub
-    #   torch
-greenlet==3.2.1
-    # via playwright
-h11==0.16.0
-    # via
-    #   httpcore
-    #   uvicorn
-    #   wsproto
-httpcore==1.0.9
-    # via httpx
-httptools==0.6.4
-    # via uvicorn
-httpx==0.27.2
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-    #   fief-client
-    #   litellm
-    #   openai
-huggingface-hub==0.30.2
-    # via
-    #   -r requirements.in
-    #   sentence-transformers
-    #   tokenizers
-    #   transformers
-humanize==4.12.3
-    # via crawl4ai
-idna==3.10
-    # via
-    #   anyio
-    #   httpx
-    #   requests
-    #   trio
-    #   yarl
-importlib-metadata==8.7.0
-    # via litellm
-jinja2==3.1.6
-    # via
-    #   litellm
-    #   torch
-jiter==0.9.0
-    # via openai
-joblib==1.4.2
-    # via
-    #   -r requirements.in
-    #   nltk
-    #   scikit-learn
-jsonschema==4.23.0
-    # via litellm
-jsonschema-specifications==2025.4.1
-    # via jsonschema
-jwcrypto==1.5.6
-    # via fief-client
-kombu==5.5.3
-    # via celery
-litellm==1.67.5
-    # via crawl4ai
-lxml==5.4.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-markdown-it-py==3.0.0
-    # via rich
-markupsafe==3.0.2
-    # via jinja2
-mdurl==0.1.2
-    # via markdown-it-py
-mpmath==1.3.0
-    # via sympy
-multidict==6.4.3
-    # via
-    #   aiohttp
-    #   yarl
-networkx==3.4.2
-    # via
-    #   -r requirements.in
-    #   torch
-nltk==3.9.1
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-numpy>=1.20.0
-numpy==2.2.5
-    # via
-    #   crawl4ai
-    #   pandas
-    #   rank-bm25
-    #   scikit-learn
-    #   scipy
-    #   transformers
-nvidia-ml-py==12.570.86
-    # via pynvml
-openai==1.76.2
-    # via litellm
-outcome==1.3.0.post0
-    # via
-    #   trio
-    #   trio-websocket
-packaging==25.0
-    # via
-    #   huggingface-hub
-    #   transformers
-pandas==2.2.3
-    # via
-    #   -r requirements.in
-    #   codecarbon
-pillow==10.4.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-    #   sentence-transformers
-playwright==1.52.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-    #   tf-playwright-stealth
-prometheus-client==0.21.1
-    # via
-    #   -r requirements.in
-    #   codecarbon
-prompt-toolkit==3.0.51
-    # via
-    #   click-repl
-    #   questionary
-propcache==0.3.1
-    # via
-    #   aiohttp
-    #   yarl
-psutil==7.0.0
-    # via
-    #   -r requirements.in
-    #   codecarbon
-    #   crawl4ai
-py-cpuinfo==9.0.0
-    # via codecarbon
-pyclamd==0.4.0
-    # via -r requirements.in
-pycparser==2.22
-    # via cffi
-pydantic==2.11.4
-    # via
-    #   codecarbon
-    #   crawl4ai
-    #   fastapi
-    #   litellm
-    #   openai
-pydantic-core==2.33.2
-    # via pydantic
-pyee==13.0.0
-    # via
-    #   -r requirements.in
-    #   playwright
-pygments==2.19.1
-    # via rich
-pyjwt==2.9.0
-    # via
-    #   -r requirements.in
-    #   redis
-pynvml==12.0.0
-    # via codecarbon
-pyopenssl==25.0.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-pyperclip==1.9.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-pysocks==1.7.1
-    # via urllib3
-python-dateutil==2.9.0.post0
-    # via
-    #   arrow
-    #   celery
-    #   pandas
-python-dotenv==1.1.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-    #   litellm
-    #   uvicorn
-pytz==2025.2
-    # via pandas
-pyyaml==6.0.2
-    # via
-    #   huggingface-hub
-    #   transformers
-    #   uvicorn
-questionary==2.1.0
-    # via codecarbon
-rank-bm25==0.2.2
-    # via crawl4ai
-rapidfuzz==3.13.0
-    # via codecarbon
-redis==5.3.0
-    # via celery
-referencing==0.36.2
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-regex==2024.11.6
-    # via
-    #   -r requirements.in
-    #   nltk
-    #   tiktoken
-    #   transformers
-requests==2.32.3
-    # via
-    #   -r requirements.in
-    #   codecarbon
-    #   crawl4ai
-    #   huggingface-hub
-    #   tiktoken
-    #   transformers
-rich==14.0.0
-    # via
-    #   -r requirements.in
-    #   codecarbon
-    #   crawl4ai
-    #   typer
-rpds-py==0.24.0
-    # via
-    #   jsonschema
-    #   referencing
-safetensors==0.5.3
-    # via
-    #   -r requirements.in
-    #   transformers
-scikit-learn==1.6.1
-    # via
-    #   -r requirements.in
-    #   sentence-transformers
-scipy==1.15.2
-    # via
-    #   scikit-learn
-    #   sentence-transformers
-selenium==4.31.0
-    # via -r requirements.in
-sentence-transformers==4.1.0
-    # via -r requirements.in
-sentencepiece>=0.1.96
-shellingham==1.5.4
-    # via
-    #   -r requirements.in
-    #   typer
-six==1.17.0
-    # via python-dateutil
-sniffio==1.3.1
-    # via
-    #   anyio
-    #   httpx
-    #   openai
-    #   trio
-snntorch==0.9.4
-    # via -r requirements.in
-snowballstemmer==2.2.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-sortedcontainers==2.4.0
-    # via trio
-soupsieve==2.7
-    # via beautifulsoup4
-starlette==0.46.2
-    # via fastapi
-sympy==1.14.0
-    # via torch
-termcolor==2.3.0
-    # via yaspin
-tf-playwright-stealth==1.1.2
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-threadpoolctl==3.6.0
-    # via
-    #   -r requirements.in
-    #   scikit-learn
-tiktoken==0.9.0
-    # via litellm
-tokenizers==0.21.1
-    # via
-    #   -r requirements.in
-    #   litellm
-    #   transformers
 torch>=1.13.0
-torch==2.7.0
-    # via
-    #   -r requirements.in
-    #   sentence-transformers
-tqdm==4.67.1
-    # via
-    #   -r requirements.in
-    #   huggingface-hub
-    #   nltk
-    #   openai
-    #   sentence-transformers
-    #   transformers
 transformers>=4.30.0
-transformers==4.51.3
-    # via
-    #   -r requirements.in
-    #   sentence-transformers
-trio==0.30.0
-    # via
-    #   selenium
-    #   trio-websocket
-trio-websocket==0.12.2
-    # via selenium
-typer==0.15.3
-    # via
-    #   -r requirements.in
-    #   codecarbon
-types-python-dateutil==2.9.0.20241206
-    # via arrow
-typing-extensions==4.13.2
-    # via
-    #   aiosqlite
-    #   anyio
-    #   beautifulsoup4
-    #   fastapi
-    #   huggingface-hub
-    #   jwcrypto
-    #   openai
-    #   pydantic
-    #   pydantic-core
-    #   pyee
-    #   pyopenssl
-    #   referencing
-    #   selenium
-    #   sentence-transformers
-    #   torch
-    #   typer
-    #   typing-inspection
-typing-inspection==0.4.0
-    # via pydantic
-tzdata==2025.2
-    # via
-    #   kombu
-    #   pandas
-urllib3[socks]==2.4.0
-    # via
-    #   requests
-    #   selenium
-uvicorn[standard]==0.34.2
-    # via -r requirements.in
-vine==5.1.0
-    # via
-    #   amqp
-    #   celery
-    #   kombu
-watchfiles==1.0.5
-    # via uvicorn
-wcwidth==0.2.13
-    # via prompt-toolkit
-websocket-client==1.8.0
-    # via selenium
-websockets==15.0.1
-    # via uvicorn
-wsproto==1.2.0
-    # via trio-websocket
-xxhash==3.5.0
-    # via
-    #   -r requirements.in
-    #   crawl4ai
-yarl==1.20.0
-    # via aiohttp
-yaspin==3.1.0
-    # via
-    #   -r requirements.in
-    #   fief-client
-zipp==3.21.0
-    # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+sentencepiece>=0.1.96
+numpy>=1.20.0
+einops>=0.6.0
 pydantic==2.0.3
 codecarbon==2.2.3