dtSpark 1.1.0a2__tar.gz → 1.1.0a3__tar.gz

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtSpark
-Version: 1.1.0a2
+Version: 1.1.0a3
 Summary: Secure Personal AI Research Kit - Multi-provider LLM CLI/Web interface with MCP tool integration
 Home-page: https://github.com/digital-thought/dtSpark
 Author: Matthew Westwood-Hill

dtspark-1.1.0a3/src/dtSpark/_version.txt

@@ -0,0 +1 @@
+1.1.0a3

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/core/application.py

@@ -1016,8 +1016,9 @@ class AWSBedrockCLI(AbstractApp):
                 logging.debug("Predefined conversations not enabled in config")
                 return
 
-            # Get the mandatory model setting
+            # Get the mandatory model and provider settings
             mandatory_model = self._get_nested_setting('llm_providers.mandatory_model', None)
+            mandatory_provider = self._get_nested_setting('llm_providers.mandatory_provider', None)
 
             # Get list of predefined conversations
             predefined_convs = self.settings.get('predefined_conversations.conversations', [])
@@ -1135,27 +1136,45 @@ class AWSBedrockCLI(AbstractApp):
         if not source or not source.strip():
             return source
 
-        # Try ResourceManager first
-        try:
-            resource_content = ResourceManager().load_resource(source)
-            if resource_content is not None:
-                logging.info(f"Loaded {description} via ResourceManager from: {source}")
-                return resource_content
-        except Exception as e:
-            logging.debug(f"ResourceManager could not load {description} from '{source}': {e}")
+        import os
 
-        # Try direct file path
-        try:
-            import os
-            if os.path.isfile(source):
-                with open(source, 'r', encoding='utf-8') as f:
-                    content = f.read()
-                    logging.info(f"Loaded {description} from file path: {source}")
-                    return content
-        except Exception as e:
-            logging.debug(f"Could not load {description} from file path '{source}': {e}")
+        # Determine if source looks like a file path or resource name
+        # (contains path separators, has a file extension, or doesn't contain spaces)
+        looks_like_path = (
+            os.sep in source
+            or '/' in source
+            or '\\' in source
+            or (
+                '.' in source
+                and not source.strip().endswith('.')
+                and ' ' not in source.strip()
+            )
+        )
+
+        if looks_like_path:
+            # Try ResourceManager first (for package resources)
+            try:
+                resource_content = ResourceManager().load_resource(source)
+                if resource_content is not None:
+                    logging.info(f"Loaded {description} via ResourceManager from: {source}")
+                    return resource_content
+            except Exception as e:
+                logging.debug(f"ResourceManager could not load {description} from '{source}': {e}")
+
+            # Try direct file path
+            try:
+                if os.path.isfile(source):
+                    with open(source, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                        logging.info(f"Loaded {description} from file path: {source}")
+                        return content
+            except Exception as e:
+                logging.debug(f"Could not load {description} from file path '{source}': {e}")
+
+            # Path-like source but couldn't load - log warning and return as-is
+            logging.warning(f"Could not load {description} from path '{source}', using as inline text")
 
-        # If both methods fail, assume it's inline text
+        # Treat as inline text
         logging.debug(f"Using inline text for {description}")
         return source
 

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/endpoints/chat.py

@@ -448,6 +448,16 @@ async def command_change_model(
     try:
         app_instance = request.app.state.app_instance
 
+        # Check if model is locked via configuration
+        mandatory_model = getattr(app_instance, 'configured_model_id', None)
+        if mandatory_model:
+            return CommandResponse(
+                command="changemodel",
+                status="error",
+                message=f"Model changing is disabled - model is locked to '{mandatory_model}' via configuration",
+                data=None,
+            )
+
         # Load conversation
         app_instance.conversation_manager.load_conversation(conversation_id)
 

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/endpoints/conversations.py

@@ -179,6 +179,14 @@ async def create_conversation(
         database = app_instance.database
         conversation_manager = app_instance.conversation_manager
 
+        # Enforce mandatory model if configured
+        mandatory_model = getattr(app_instance, 'configured_model_id', None)
+        mandatory_provider = getattr(app_instance, 'configured_provider', None)
+        if mandatory_model:
+            model_id = mandatory_model
+            logger.info(f"Mandatory model enforced: {model_id}"
+                        f"{f' via {mandatory_provider}' if mandatory_provider else ''}")
+
         # Create conversation in database
         conversation_id = database.create_conversation(
             name=name,
@@ -190,7 +198,7 @@ async def create_conversation(
         conversation_manager.load_conversation(conversation_id)
 
         # Set the model from the conversation and update service references
-        app_instance.llm_manager.set_model(model_id)
+        app_instance.llm_manager.set_model(model_id, mandatory_provider)
         app_instance.bedrock_service = app_instance.llm_manager.get_active_service()
         conversation_manager.update_service(app_instance.bedrock_service)
 
@@ -325,29 +333,59 @@ async def delete_conversation(
 async def list_models(
     request: Request,
     session_id: str = Depends(get_current_session),
-) -> List[dict]:
+) -> dict:
     """
-    Get available models.
+    Get available models and mandatory model configuration.
 
     Returns:
-        List of available models with their IDs and names
+        Dictionary with models list and mandatory model info
     """
     try:
         app_instance = request.app.state.app_instance
 
+        mandatory_model = getattr(app_instance, 'configured_model_id', None)
+        mandatory_provider = getattr(app_instance, 'configured_provider', None)
+
         # Get available models from LLM manager
-        models = app_instance.llm_manager.list_all_models()
+        all_models = app_instance.llm_manager.list_all_models()
 
-        return [
+        models = [
             {
                 "id": model.get('id', model.get('name', 'unknown')),
                 "name": model.get('name', 'Unknown'),
                 "provider": model.get('provider', 'Unknown'),
-                "model_maker": model.get('model_maker'),  # Optional: model creator (for Bedrock models)
+                "model_maker": model.get('model_maker'),
             }
-            for model in models
+            for model in all_models
         ]
 
+        # If mandatory model is set, filter to matching models only
+        if mandatory_model:
+            filtered = [
+                m for m in models
+                if m['id'] == mandatory_model
+                or m['name'] == mandatory_model
+            ]
+
+            # Further filter by provider if mandatory_provider is set
+            if mandatory_provider and filtered:
+                provider_filtered = [
+                    m for m in filtered
+                    if m['provider'] == mandatory_provider
+                ]
+                if provider_filtered:
+                    filtered = provider_filtered
+
+            if filtered:
+                models = filtered
+
+        return {
+            "models": models,
+            "mandatory_model": mandatory_model,
+            "mandatory_provider": mandatory_provider,
+            "model_locked": mandatory_model is not None,
+        }
+
     except Exception as e:
         logger.error(f"Error listing models: {e}")
         raise HTTPException(status_code=500, detail=str(e))

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/static/js/actions.js

@@ -624,7 +624,8 @@ async function loadModels() {
         const response = await fetch('/api/models');
         if (!response.ok) throw new Error('Failed to load models');
 
-        availableModels = await response.json();
+        const data = await response.json();
+        availableModels = data.models || data;
 
         const select = document.getElementById('actionModel');
         select.innerHTML = '<option value="">Select a model...</option>';

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/templates/chat.html

@@ -324,70 +324,72 @@ async function performExport() {
 
 // Change model
 async function showChangeModelModal() {
-    const modalHTML = `
-        <div class="modal fade" id="changeModelModal" tabindex="-1">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> Change Model</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Select New Model</label>
-                            <select class="form-select" id="new-model-select">
-                                <option value="">Loading models...</option>
-                            </select>
+    // Check if model is locked first
+    try {
+        const configResponse = await fetch('/api/models');
+        const configData = await configResponse.json();
+
+        if (configData.model_locked) {
+            showToast(`Model changing is disabled - model is locked to '${configData.mandatory_model}' via configuration`, 'error');
+            return;
+        }
+
+        const models = configData.models || configData;
+
+        const modalHTML = `
+            <div class="modal fade" id="changeModelModal" tabindex="-1">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> Change Model</h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                        </div>
+                        <div class="modal-body">
+                            <div class="mb-3">
+                                <label class="form-label">Select New Model</label>
+                                <select class="form-select" id="new-model-select">
+                                    <option value="">Select a model...</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                            <button type="button" class="btn btn-primary" onclick="performChangeModel()">
+                                <i class="bi bi-check-circle-fill"></i> Change Model
+                            </button>
                         </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-                        <button type="button" class="btn btn-primary" onclick="performChangeModel()">
-                            <i class="bi bi-check-circle-fill"></i> Change Model
-                        </button>
                     </div>
                 </div>
             </div>
-        </div>
-    `;
-
-    // Remove old modal if exists
-    const oldModal = document.getElementById('changeModelModal');
-    if (oldModal) oldModal.remove();
+        `;
 
-    document.body.insertAdjacentHTML('beforeend', modalHTML);
+        // Remove old modal if exists
+        const oldModal = document.getElementById('changeModelModal');
+        if (oldModal) oldModal.remove();
 
-    // Load models
-    try {
-        const response = await fetch('/api/models');
-        const models = await response.json();
+        document.body.insertAdjacentHTML('beforeend', modalHTML);
 
         const select = document.getElementById('new-model-select');
-        select.innerHTML = '<option value="">Select a model...</option>';
-
         models.forEach(model => {
             const option = document.createElement('option');
             option.value = model.id;
 
-            // Show service provider and optionally model maker
             let displayText = model.name;
             if (model.model_maker && model.provider !== model.model_maker) {
-                // Show both: "Model Name [Model Maker via Service Provider]"
                 displayText += ` [${model.model_maker} via ${model.provider}]`;
             } else {
-                // Show service only: "Model Name [Service Provider]"
                 displayText += ` [${model.provider}]`;
             }
 
             option.textContent = displayText;
             select.appendChild(option);
         });
+
+        const modal = new bootstrap.Modal(document.getElementById('changeModelModal'));
+        modal.show();
     } catch (error) {
-        document.getElementById('new-model-select').innerHTML = '<option value="">Failed to load models</option>';
+        showToast('Failed to load models', 'error');
     }
-
-    const modal = new bootstrap.Modal(document.getElementById('changeModelModal'));
-    modal.show();
 }
 
 async function performChangeModel() {

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/templates/conversations.html

@@ -226,28 +226,49 @@ async function showNewConversationModal() {
 async function loadModels() {
     try {
         const response = await fetch('/api/models');
-        const models = await response.json();
+        const data = await response.json();
+
+        const models = data.models || data;
+        const modelLocked = data.model_locked || false;
 
         const select = document.getElementById('model-select');
-        select.innerHTML = '<option value="">Select a model...</option>';
-
-        models.forEach(model => {
-            const option = document.createElement('option');
-            option.value = model.id;
-
-            // Show service provider and optionally model maker
-            let displayText = model.name;
-            if (model.model_maker && model.provider !== model.model_maker) {
-                // Show both: "Model Name [Model Maker via Service Provider]"
-                displayText += ` [${model.model_maker} via ${model.provider}]`;
-            } else {
-                // Show service only: "Model Name [Service Provider]"
-                displayText += ` [${model.provider}]`;
-            }
-
-            option.textContent = displayText;
-            select.appendChild(option);
-        });
+
+        if (modelLocked) {
+            select.innerHTML = '';
+            models.forEach(model => {
+                const option = document.createElement('option');
+                option.value = model.id;
+                let displayText = model.name;
+                if (model.provider) {
+                    displayText += ` [${model.provider}]`;
+                }
+                option.textContent = displayText;
+                option.selected = true;
+                select.appendChild(option);
+            });
+            select.disabled = true;
+
+            const infoDiv = document.createElement('div');
+            infoDiv.className = 'form-text text-info';
+            infoDiv.innerHTML = '<i class="bi bi-lock-fill"></i> Model is locked via configuration';
+            select.parentNode.appendChild(infoDiv);
+        } else {
+            select.innerHTML = '<option value="">Select a model...</option>';
+            models.forEach(model => {
+                const option = document.createElement('option');
+                option.value = model.id;
+
+                let displayText = model.name;
+                if (model.model_maker && model.provider !== model.model_maker) {
+                    displayText += ` [${model.model_maker} via ${model.provider}]`;
+                } else {
+                    displayText += ` [${model.provider}]`;
+                }
+
+                option.textContent = displayText;
+                select.appendChild(option);
+            });
+        }
 
     } catch (error) {
         document.getElementById('model-select').innerHTML = `
@@ -259,6 +280,13 @@ async function loadModels() {
 // Create conversation
 async function createConversation() {
     const form = document.getElementById('new-conversation-form');
+
+    // Re-enable disabled select so its value is included in form data
+    const modelSelect = document.getElementById('model-select');
+    if (modelSelect.disabled) {
+        modelSelect.disabled = false;
+    }
+
     const formData = new FormData(form);
 
     try {

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark/web/templates/new_conversation.html

@@ -92,28 +92,53 @@
 async function loadModels() {
     try {
         const response = await fetch('/api/models');
-        const models = await response.json();
+        const data = await response.json();
+
+        const models = data.models || data;
+        const modelLocked = data.model_locked || false;
 
         const select = document.getElementById('model-select');
-        select.innerHTML = '<option value="">Select a model...</option>';
-
-        models.forEach(model => {
-            const option = document.createElement('option');
-            option.value = model.id;
-
-            // Show service provider and optionally model maker
-            let displayText = model.name;
-            if (model.model_maker && model.provider !== model.model_maker) {
-                // Show both: "Model Name [Model Maker via Service Provider]"
-                displayText += ` [${model.model_maker} via ${model.provider}]`;
-            } else {
-                // Show service only: "Model Name [Service Provider]"
-                displayText += ` [${model.provider}]`;
-            }
-
-            option.textContent = displayText;
-            select.appendChild(option);
-        });
+
+        if (modelLocked) {
+            // Model is locked - show only the mandatory model and disable selection
+            select.innerHTML = '';
+            models.forEach(model => {
+                const option = document.createElement('option');
+                option.value = model.id;
+
+                let displayText = model.name;
+                if (model.provider) {
+                    displayText += ` [${model.provider}]`;
+                }
+                option.textContent = displayText;
+                option.selected = true;
+                select.appendChild(option);
+            });
+            select.disabled = true;
+
+            // Add info message below the select
+            const infoDiv = document.createElement('div');
+            infoDiv.className = 'form-text text-info';
+            infoDiv.innerHTML = '<i class="bi bi-lock-fill"></i> Model is locked via configuration';
+            select.parentNode.appendChild(infoDiv);
+        } else {
+            select.innerHTML = '<option value="">Select a model...</option>';
+            models.forEach(model => {
+                const option = document.createElement('option');
+                option.value = model.id;
+
+                // Show service provider and optionally model maker
+                let displayText = model.name;
+                if (model.model_maker && model.provider !== model.model_maker) {
+                    displayText += ` [${model.model_maker} via ${model.provider}]`;
+                } else {
+                    displayText += ` [${model.provider}]`;
+                }
+
+                option.textContent = displayText;
+                select.appendChild(option);
+            });
+        }
     } catch (error) {
         console.error('Error loading models:', error);
         showToast('Failed to load models', 'error');
@@ -146,6 +171,12 @@ function showToast(message, type = 'info') {
 document.getElementById('new-conversation-form').addEventListener('submit', async (e) => {
     e.preventDefault();
 
+    // Re-enable disabled select so its value is included in form data
+    const modelSelect = document.getElementById('model-select');
+    if (modelSelect.disabled) {
+        modelSelect.disabled = false;
+    }
+
     const formData = new FormData(e.target);
 
     try {

{dtspark-1.1.0a2 → dtspark-1.1.0a3}/src/dtSpark.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtSpark
-Version: 1.1.0a2
+Version: 1.1.0a3
 Summary: Secure Personal AI Research Kit - Multi-provider LLM CLI/Web interface with MCP tool integration
 Home-page: https://github.com/digital-thought/dtSpark
 Author: Matthew Westwood-Hill

dtspark-1.1.0a2/src/dtSpark/_version.txt

@@ -1 +0,0 @@
-1.1.0a2