Extra commit for files in 'common'

- Add functionality to add a default dictionary for configuration fields
- Correct entitlement processing
- Remove get_template functionality from ModelVariables, define it directly with LLM model definition in configuration file.

common/utils/model_utils.py

@@ -14,7 +14,7 @@ from common.eveai_model.tracked_mistral_embeddings import TrackedMistralAIEmbedd
 from common.langchain.tracked_transcription import TrackedOpenAITranscription
 from common.models.user import Tenant
 from config.model_config import MODEL_CONFIG
-from common.extensions import template_manager
+from common.extensions import cache_manager
 from common.models.document import EmbeddingMistral
 from common.utils.eveai_exceptions import EveAITenantNotFound, EveAIInvalidEmbeddingModel
 from crewai import LLM
@@ -139,6 +139,19 @@ def process_pdf():
     full_model_name = 'mistral-ocr-latest'
 
 
+def get_template(template_name: str, version: Optional[str] = "1.0") -> tuple[
+    Any, BaseChatModel | None | ChatOpenAI | ChatMistralAI]:
+    """
+    Get a prompt template
+    """
+    prompt = cache_manager.prompts_config_cache.get_config(template_name, version)
+    if "llm_model" in prompt:
+        llm = get_embedding_llm(full_model_name=prompt["llm_model"])
+    else:
+        llm = get_embedding_llm()
+
+    return prompt["content"], llm
+
 
 class ModelVariables:
     """Manages model-related variables and configurations"""
@@ -261,31 +274,6 @@ class ModelVariables:
     def transcribe(self, *args, **kwargs):
         raise DeprecationWarning("Use transcription_model.transcribe() instead")
 
-    def get_template(self, template_name: str, version: Optional[str] = None) -> str:
-        """
-        Get a template for the tenant's configured LLM
-
-        Args:
-            template_name: Name of the template to retrieve
-            version: Optional specific version to retrieve
-
-        Returns:
-            The template content
-        """
-        try:
-            template = template_manager.get_template(
-                self._variables['llm_full_model'],
-                template_name,
-                version
-            )
-            return template.content
-        except Exception as e:
-            current_app.logger.error(f"Error getting template {template_name}: {str(e)}")
-            # Fall back to old template loading if template_manager fails
-            if template_name in self._variables.get('templates', {}):
-                return self._variables['templates'][template_name]
-            raise
-
 
 # Helper function to get cached model variables
 def get_model_variables(tenant_id: int) -> ModelVariables:

common/utils/template_filters.py

@@ -2,6 +2,7 @@
 
 import pytz
 from datetime import datetime
+from common.utils.nginx_utils import prefixed_url_for as puf
 
 
 def to_local_time(utc_dt, timezone_str):
@@ -42,6 +43,10 @@ def status_color(status_name):
     return colors.get(status_name, 'secondary')
 
 
+def prefixed_url_for(endpoint):
+    return puf(endpoint)
+
+
 def register_filters(app):
     """
     Registers custom filters with the Flask app.
@@ -49,3 +54,6 @@ def register_filters(app):
     app.jinja_env.filters['to_local_time'] = to_local_time
     app.jinja_env.filters['time_difference'] = time_difference
     app.jinja_env.filters['status_color'] = status_color
+    app.jinja_env.filters['prefixed_url_for'] = prefixed_url_for
+
+    app.jinja_env.globals['prefixed_url_for'] = prefixed_url_for