Feature/group agents actions

.github/workflows/docker_image_publish.yml

@@ -25,16 +25,6 @@ jobs:
         login-server: ${{ secrets.ACR_LOGIN_SERVER }}
 
     - uses: actions/checkout@v3
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - name: Install Ajv
-      run: npm install ajv@^8.0.0 ajv-cli@^5.0.0
-    - name: Install Ajv
-      run: npm install ajv@^8.0.0 ajv-formats
-    - name: Generate standalone JSON schema validators
-      run: node scripts/generate-validators.mjs
     - name: Build the Docker image
       run:         
         docker build . --file application/single_app/Dockerfile --tag ${{ secrets.ACR_LOGIN_SERVER }}/simple-chat:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;

.github/workflows/docker_image_publish_dev.yml

@@ -26,14 +26,6 @@ jobs:
         login-server: ${{ secrets.ACR_LOGIN_SERVER }}
 
     - uses: actions/checkout@v3
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - name: Install Ajv
-      run: npm install ajv@^8.0.0 ajv-formats
-    - name: Generate standalone JSON schema validators
-      run: node scripts/generate-validators.mjs
     - name: Build the Docker image
       run:         
         docker build . --file application/single_app/Dockerfile --tag ${{ secrets.ACR_LOGIN_SERVER }}/simple-chat-dev:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;

.github/workflows/docker_image_publish_nadoyle.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
     - nadoyle
-    - keyvaultForSecrets
+    - feature/group-agents-actions
 
   workflow_dispatch:
 
@@ -27,14 +27,6 @@ jobs:
         login-server: ${{ secrets.ACR_LOGIN_SERVER_NADOYLE }}
 
     - uses: actions/checkout@v3
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - name: Install Ajv
-      run: npm install ajv@^8.0.0 ajv-formats
-    - name: Generate standalone JSON schema validators
-      run: node scripts/generate-validators.mjs
     - name: Build the Docker image
       run:         
         docker build . --file application/single_app/Dockerfile --tag ${{ secrets.ACR_LOGIN_SERVER_NADOYLE }}/simple-chat-dev:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;

application/single_app/app.py

@@ -159,7 +159,7 @@ def configure_sessions(settings):
 @app.before_first_request
 def before_first_request():
     print("Initializing application...")
-    settings = get_settings()
+    settings = get_settings(use_cosmos=True)
     app_settings_cache.configure_app_cache(settings, get_redis_cache_infrastructure_endpoint(settings.get('redis_url', '').strip().split('.')[0]))
     app_settings_cache.update_settings_cache(settings)
     print(f"DEBUG:Application settings: {settings}")
@@ -456,7 +456,7 @@ def list_semantic_kernel_plugins():
 register_route_external_health(app)
 
 if __name__ == '__main__':
-    settings = get_settings()
+    settings = get_settings(use_cosmos=True)
     app_settings_cache.configure_app_cache(settings, get_redis_cache_infrastructure_endpoint(settings.get('redis_url', '').strip().split('.')[0]))
     app_settings_cache.update_settings_cache(settings)
     initialize_clients(settings)

application/single_app/config.py

@@ -88,8 +88,7 @@
 EXECUTOR_TYPE = 'thread'
 EXECUTOR_MAX_WORKERS = 30
 SESSION_TYPE = 'filesystem'
-VERSION = "0.233.153"
-
+VERSION = "0.233.166"
 
 
 SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production')

application/single_app/functions_appinsights.py

@@ -47,8 +47,7 @@ def log_event(
     try:
         try:
             cache = app_settings_cache.get_settings_cache() or None
-        except Exception as e:
-            print(f"[Log] Could not retrieve settings cache: {e}")
+        except Exception:
             cache = None
 
         # Get logger - use Azure Monitor logger if configured, otherwise standard logger

application/single_app/functions_conversation_metadata.py

@@ -45,7 +45,7 @@ def collect_conversation_metadata(user_message, conversation_id, user_id, active
                                 document_scope=None, selected_document_id=None, model_deployment=None,
                                 hybrid_search_enabled=False, 
                                 image_gen_enabled=False, selected_documents=None, 
-                                selected_agent=None, search_results=None, web_search_results=None,
+                                selected_agent=None, selected_agent_details=None, search_results=None, web_search_results=None,
                                 conversation_item=None, additional_participants=None):
     """
     Collect comprehensive metadata for a conversation based on the user's interaction.
@@ -65,6 +65,7 @@ def collect_conversation_metadata(user_message, conversation_id, user_id, active
         search_results: Results from hybrid search
         conversation_item: Existing conversation item to update
         additional_participants: List of additional user IDs to include as participants
+        selected_agent_details: Detailed agent metadata (is_group, group_id, group_name)
 
     Returns:
         dict: Updated conversation metadata
@@ -86,6 +87,25 @@ def collect_conversation_metadata(user_message, conversation_id, user_id, active
     if 'strict' not in conversation_item:
         conversation_item['strict'] = False
 
+    # Prepare agent-derived group context (used when agent is a group and no documents were used)
+    agent_primary_context = None
+    agent_primary_context_active = False
+    if selected_agent_details and selected_agent_details.get('is_group'):
+        group_id = selected_agent_details.get('group_id')
+        group_name = selected_agent_details.get('group_name')
+
+        if group_id:
+            if not group_name:
+                group_info = find_group_by_id(group_id)
+                if group_info:
+                    group_name = group_info.get('name')
+            agent_primary_context = {
+                "type": "primary",
+                "scope": "group",
+                "id": group_id,
+                "name": group_name or "Unknown Group"
+            }
+
     # Process documents from search results first to determine primary context
     document_map = {}  # Map of document_id -> {scope, chunks, classification}
     workspace_used = None  # Track the first workspace used (becomes primary context)
@@ -144,19 +164,30 @@ def collect_conversation_metadata(user_message, conversation_id, user_id, active
             "id": scope_id,
             "name": context_name
         }
-    # If no documents were used, we don't set a primary context yet
-    # This allows us to track conversations that only use model knowledge
+    # If no documents were used, fall back to agent-based primary context
+    if not primary_context and agent_primary_context:
+        primary_context = agent_primary_context
+        agent_primary_context_active = True
 
     # Update or add primary context only if we don't already have one
     existing_primary = next((ctx for ctx in conversation_item['context'] if ctx.get('type') == 'primary'), None)
     if primary_context:
         if existing_primary:
-            # Primary context already exists - check if this is the same workspace
+            # Primary context already exists - determine how to handle the new context
             if (existing_primary.get('scope') == primary_context.get('scope') and 
                 existing_primary.get('id') == primary_context.get('id')):
                 # Same workspace - update existing primary context (e.g., refresh name)
                 existing_primary.update(primary_context)
                 debug_print(f"Updated existing primary context: {existing_primary}")
+            elif agent_primary_context_active:
+                # Promote the group agent context to become the new primary context
+                existing_primary.update({
+                    "scope": primary_context.get('scope'),
+                    "id": primary_context.get('id'),
+                    "name": primary_context.get('name')
+                })
+                debug_print(f"Replaced existing primary context with agent group context: {existing_primary}")
+                primary_context = None
             else:
                 # Different workspace - this should become a secondary context
                 debug_print(f"Primary context already exists ({existing_primary.get('scope')}:{existing_primary.get('id')}), "f"treating new workspace ({primary_context.get('scope')}:{primary_context.get('id')}) as secondary")

application/single_app/functions_global_agents.py

@@ -40,6 +40,8 @@ def ensure_default_global_agent_exists():
                 "azure_agent_apim_gpt_api_version": "",
                 "enable_agent_gpt_apim": False,
                 "is_global": True,
+                "is_group": False,
+                "agent_type": "local",
                 "instructions": (
                     "You are a highly capable research assistant. Your role is to help the user investigate academic, technical, and real-world topics by finding relevant information, summarizing key points, identifying knowledge gaps, and suggesting credible sources for further study.\n\n"
                     "You must always:\n- Think step-by-step and work methodically.\n- Distinguish between fact, inference, and opinion.\n- Clearly state your assumptions when making inferences.\n- Cite authoritative sources when possible (e.g., peer-reviewed journals, academic publishers, government agencies).\n- Avoid speculation unless explicitly asked for.\n- When asked to summarize, preserve the intent, nuance, and technical accuracy of the original content.\n- When generating questions, aim for depth and clarity to guide rigorous inquiry.\n- Present answers in a clear, structured format using bullet points, tables, or headings when appropriate.\n\n"
@@ -105,6 +107,9 @@ def get_global_agents():
         for agent in agents:
             if agent.get('max_completion_tokens') is None:
                 agent['max_completion_tokens'] = -1
+            agent.setdefault('is_global', True)
+            agent.setdefault('is_group', False)
+            agent.setdefault('agent_type', 'local')
         return agents
     except Exception as e:
         log_event(
@@ -135,6 +140,9 @@ def get_global_agent(agent_id):
         agent = keyvault_agent_get_helper(agent, agent_id, scope="global")
         if agent.get('max_completion_tokens') is None:
             agent['max_completion_tokens'] = -1
+        agent.setdefault('is_global', True)
+        agent.setdefault('is_group', False)
+        agent.setdefault('agent_type', 'local')
         print(f"Found global agent: {agent_id}")
         return agent
     except Exception as e:
@@ -165,6 +173,8 @@ def save_global_agent(agent_data):
             agent_data['id'] = str(uuid.uuid4())
         # Add metadata
         agent_data['is_global'] = True
+        agent_data['is_group'] = False
+        agent_data.setdefault('agent_type', 'local')
         agent_data['created_at'] = datetime.utcnow().isoformat()
         agent_data['updated_at'] = datetime.utcnow().isoformat()
         log_event(

application/single_app/functions_group.py

@@ -3,6 +3,7 @@
 from config import *
 from functions_authentication import *
 from functions_settings import *
+from typing import Iterable
 
 
 def create_group(name, description):
@@ -128,6 +129,32 @@ def get_user_role_in_group(group_doc, user_id):
     return None
 
 
+def require_active_group(user_id: str) -> str:
+    """Return the active group id for a user or raise ValueError if missing."""
+    settings = get_user_settings(user_id)
+    active_group_id = settings.get("settings", {}).get("activeGroupOid")
+    if not active_group_id:
+        raise ValueError("No active group selected")
+    return active_group_id
+
+
+def assert_group_role(user_id: str, group_id: str, allowed_roles: Iterable[str] = ("Owner", "Admin")) -> str:
+    """Ensure the user holds one of the allowed roles for the group."""
+    group_doc = find_group_by_id(group_id)
+    if not group_doc:
+        raise LookupError("Group not found")
+
+    role = get_user_role_in_group(group_doc, user_id)
+    if not role:
+        raise PermissionError("User is not a member of this group")
+
+    allowed = {r.lower() for r in allowed_roles}
+    if role.lower() not in allowed:
+        raise PermissionError("Insufficient permissions for this group")
+
+    return role
+
+
 def map_group_list_for_frontend(groups, current_user_id):
     """
     Utility to produce a simplified list of group data