Simplify model management for single model use case - remove dictionary complexity

Co-authored-by: alvarolopez <[email protected]>

Author: Copilot

deepaas/model/__init__.py

@@ -16,13 +16,7 @@
 
 from deepaas.model import v2
 
-# Create a proper module-level property using __getattr__ (Python 3.7+)
-def __getattr__(name):
-    if name == 'V2_MODELS':
-        return v2.MODELS
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-# Backwards compatibility - these will be updated after model registration
+# Direct access to the single model
 V2_MODEL = None
 V2_MODEL_NAME = None
 
@@ -35,12 +29,18 @@ def register_v2_models(app):
     """
     global V2_MODEL, V2_MODEL_NAME
 
-    result = v2.register_models(app)
-    
-    # Update backwards compatibility variables
-    if v2.MODELS:
-        model_names = list(v2.MODELS.keys())
-        V2_MODEL_NAME = model_names[0]
-        V2_MODEL = v2.MODELS[V2_MODEL_NAME]
+    v2.register_models(app)
 
-    return result
+    # Update module-level variables for easy access
+    V2_MODEL = v2.MODEL
+    V2_MODEL_NAME = v2.MODEL_NAME
+
+
+# For compatibility with code that expects V2_MODELS dictionary
+def __getattr__(name):
+    if name == 'V2_MODELS':
+        # Return a dict-like interface for the single model
+        if V2_MODEL and V2_MODEL_NAME:
+            return {V2_MODEL_NAME: V2_MODEL}
+        return {}
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

deepaas/model/v2/__init__.py

@@ -24,16 +24,21 @@
 
 CONF = config.CONF
 
-# Model registry
-MODELS = {}
-MODELS_LOADED = False
+# Model registry - simplified for single model use case
+MODEL = None
+MODEL_NAME = ""
 
 
 def register_models(app):
-    global MODELS
-    global MODELS_LOADED
+    """Register a single V2 model.
+    
+    Since DEEPaaS only handles one model at a time, this is simplified
+    to manage a single model instance.
+    """
+    global MODEL
+    global MODEL_NAME
 
-    if MODELS_LOADED:
+    if MODEL:
         return
 
     if CONF.model_name:
@@ -53,15 +58,14 @@ def register_models(app):
             raise exceptions.MultipleModelsFound()
 
     try:
-        MODELS[model_name] = wrapper.ModelWrapper(
+        MODEL = wrapper.ModelWrapper(
             model_name,
             loading.get_model_by_name(model_name, "v2"),
         )
+        MODEL_NAME = model_name
     except exceptions.ModuleNotFoundError:
         LOG.error("Model not found: %s", model_name)
         raise
     except Exception as e:
         LOG.exception("Error loading model: %s", e)
         raise e
-
-    MODELS_LOADED = True

deepaas/tests/test_v2_models.py

@@ -47,8 +47,8 @@ async def mocks(monkeypatch):
         "get_model_by_name",
         lambda x, y: fake_v2_model.TestModel,
     )
-    monkeypatch.setattr(deepaas.model.v2, "MODELS", {})
-    monkeypatch.setattr(deepaas.model.v2, "MODELS_LOADED", False)
+    monkeypatch.setattr(deepaas.model.v2, "MODEL", None)
+    monkeypatch.setattr(deepaas.model.v2, "MODEL_NAME", "")
 
 
 def test_abc():
@@ -194,8 +194,8 @@ async def test_model_with_not_implemented_attributes_and_wrapper(mocks):
 async def test_loading_ok(mocks):
     deepaas.model.v2.register_models(None)
 
-    for m in deepaas.model.v2.MODELS.values():
-        assert isinstance(m, v2_wrapper.ModelWrapper)
+    m = deepaas.model.v2.MODEL
+    assert isinstance(m, v2_wrapper.ModelWrapper)
 
 
 async def test_loading_ok_singleton(mocks, monkeypatch):
@@ -208,9 +208,10 @@ async def test_loading_ok_singleton(mocks, monkeypatch):
     )
     deepaas.model.v2.register_models(None)
 
-    for name, m in deepaas.model.v2.MODELS.items():
-        assert isinstance(m, v2_wrapper.ModelWrapper)
-        assert name != new_model_name
+    name = deepaas.model.v2.MODEL_NAME
+    m = deepaas.model.v2.MODEL
+    assert isinstance(m, v2_wrapper.ModelWrapper)
+    assert name != new_model_name
 
 
 def test_loading_error(monkeypatch):