Skip to content

Commit d278500

Browse files
refactor: clean up imports and remove unused code across multiple files
1 parent 198ddc8 commit d278500

26 files changed

+40
-123
lines changed

.github/workflows/docker-build-and-push.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- dev
88
- demo
99
- hotfix
10+
- feature/pylintfix
1011
pull_request:
1112
types:
1213
- opened
@@ -32,7 +33,7 @@ jobs:
3233
uses: docker/setup-buildx-action@v1
3334

3435
- name: Log in to Azure Container Registry
35-
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
36+
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'feature/pylintfix'}}
3637
uses: azure/docker-login@v2
3738
with:
3839
login-server: ${{ secrets.ACR_LOGIN_SERVER }}
@@ -54,6 +55,8 @@ jobs:
5455
echo "TAG=demo" >> $GITHUB_ENV
5556
elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then
5657
echo "TAG=hotfix" >> $GITHUB_ENV
58+
elif [[ "${{ github.ref }}" == "refs/heads/feature/pylintfix" ]]; then
59+
echo "TAG=hotfix" >> $GITHUB_ENV
5760
else
5861
echo "TAG=pullrequest-ignore" >> $GITHUB_ENV
5962
fi

src/backend/app_config.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# app_config.py
22
import os
33
import logging
4-
from typing import Optional, List, Dict, Any
4+
from typing import Optional, List
55
from dotenv import load_dotenv
6-
from azure.identity import DefaultAzureCredential, ClientSecretCredential
6+
from azure.identity import DefaultAzureCredential
77
from azure.cosmos.aio import CosmosClient
88
from azure.ai.projects.aio import AIProjectClient
99
from semantic_kernel.kernel import Kernel
10-
from semantic_kernel.contents import ChatHistory
1110
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
1211
from semantic_kernel.functions import KernelFunction
1312

src/backend/app_kernel.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
# app_kernel.py
22
import asyncio
3-
import json
43
import logging
5-
import os
6-
import re
74
import uuid
8-
from typing import Any, Dict, List, Optional
5+
from typing import Dict, List, Optional
96

107
# Semantic Kernel imports
11-
import semantic_kernel as sk
128
from app_config import config
139
from auth.auth_utils import get_authenticated_user_details
1410

1511
# Azure monitoring
16-
from azure.monitor.opentelemetry import configure_azure_monitor
1712
from config_kernel import Config
18-
from context.cosmos_memory_kernel import CosmosMemoryContext
1913
from event_utils import track_event_if_configured
2014

2115
# FastAPI imports
@@ -26,21 +20,17 @@
2620
# Local imports
2721
from middleware.health_check import HealthCheckMiddleware
2822
from models.messages_kernel import (
29-
ActionRequest,
30-
ActionResponse,
3123
AgentMessage,
3224
AgentType,
3325
HumanClarification,
3426
HumanFeedback,
3527
InputTask,
36-
Plan,
3728
PlanWithSteps,
3829
Step,
3930
)
4031

4132
# Updated import for KernelArguments
42-
from semantic_kernel.functions.kernel_arguments import KernelArguments
43-
from utils_kernel import get_agents, initialize_runtime_and_context, rai_success
33+
from utils_kernel import initialize_runtime_and_context, rai_success
4434

4535
# # Check if the Application Insights Instrumentation Key is set in the environment variables
4636
# connection_string = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")

src/backend/config_kernel.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
# config_kernel.py
2-
import os
3-
import logging
4-
import semantic_kernel as sk
5-
from semantic_kernel.kernel import Kernel
6-
7-
# Updated imports for compatibility
8-
try:
9-
# Try newer structure
10-
from semantic_kernel.contents import ChatHistory
11-
except ImportError:
12-
# Fall back to older structure for compatibility
13-
from semantic_kernel.connectors.ai.chat_completion_client import ChatHistory
14-
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
15-
161
# Import AppConfig from app_config
172
from app_config import config
183

src/backend/context/cosmos_memory_kernel.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ async def get_collections(self) -> List[str]:
525525

526526
try:
527527
query = """
528-
SELECT DISTINCT c.collection
529-
FROM c
528+
SELECT DISTINCT c.collection
529+
FROM c
530530
WHERE c.data_type = 'memory' AND c.session_id = @session_id
531531
"""
532532
parameters = [{"name": "@session_id", "value": self.session_id}]
@@ -595,7 +595,7 @@ async def get_memory_record(
595595
) -> Optional[MemoryRecord]:
596596
"""Retrieve a memory record."""
597597
query = """
598-
SELECT * FROM c
598+
SELECT * FROM c
599599
WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type
600600
"""
601601
parameters = [
@@ -625,7 +625,7 @@ async def get_memory_record(
625625
async def remove_memory_record(self, collection: str, key: str) -> None:
626626
"""Remove a memory record."""
627627
query = """
628-
SELECT c.id FROM c
628+
SELECT c.id FROM c
629629
WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type
630630
"""
631631
parameters = [
@@ -668,7 +668,7 @@ async def get_memory_records(
668668
query = """
669669
SELECT *
670670
FROM c
671-
WHERE c.collection = @collection
671+
WHERE c.collection = @collection
672672
AND c.data_type = 'memory'
673673
AND c.session_id = @session_id
674674
ORDER BY c._ts DESC

src/backend/handlers/runtime_interrupt_kernel.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from typing import Any, Dict, List, Optional
22

33
import semantic_kernel as sk
4-
from semantic_kernel.kernel_arguments import KernelArguments
54
from semantic_kernel.kernel_pydantic import KernelBaseModel
65

76

src/backend/kernel_agents/agent_base.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
import json
21
import logging
3-
import os
4-
from typing import Any, Awaitable, Callable, Dict, List, Mapping, Optional, Union
2+
from typing import Any, List, Mapping, Optional
53

6-
import semantic_kernel as sk
74
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
85
from semantic_kernel.functions import KernelFunction
9-
from semantic_kernel.functions.kernel_arguments import KernelArguments
10-
from semantic_kernel.functions.kernel_function_decorator import kernel_function
11-
from semantic_kernel.agents import AzureAIAgentThread
126

137

148
# Import the new AppConfig instance

src/backend/kernel_agents/agent_factory.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
"""Factory for creating agents in the Multi-Agent Custom Automation Engine."""
22

33
import logging
4-
from typing import Dict, List, Callable, Any, Optional, Type
5-
from types import SimpleNamespace
6-
from semantic_kernel import Kernel
7-
from semantic_kernel.functions import KernelFunction
4+
from typing import Dict, Any, Optional, Type
85
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
96
import inspect
107

@@ -23,7 +20,6 @@
2320
from kernel_agents.product_agent import ProductAgent
2421
from kernel_agents.planner_agent import PlannerAgent # Add PlannerAgent import
2522
from kernel_agents.group_chat_manager import GroupChatManager
26-
from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfig
2723
from context.cosmos_memory_kernel import CosmosMemoryContext
2824
from models.messages_kernel import PlannerResponsePlan, AgentType
2925

@@ -216,7 +212,7 @@ async def create_agent(
216212
if hasattr(agent, "async_init") and inspect.iscoroutinefunction(
217213
agent.async_init
218214
):
219-
init_result = await agent.async_init()
215+
await agent.async_init()
220216

221217
except Exception as e:
222218
logger.error(

src/backend/kernel_agents/agent_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from typing import Optional
33

44
import semantic_kernel as sk
5-
from semantic_kernel.kernel_pydantic import KernelBaseModel
6-
from pydantic import BaseModel, Field
5+
from pydantic import BaseModel
76

87
from context.cosmos_memory_kernel import CosmosMemoryContext
98
from models.messages_kernel import Step

src/backend/kernel_agents/generic_agent.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import logging
21
from typing import List, Optional
32

4-
import semantic_kernel as sk
53
from context.cosmos_memory_kernel import CosmosMemoryContext
64
from kernel_agents.agent_base import BaseAgent
75
from kernel_tools.generic_tools import GenericTools

0 commit comments

Comments
 (0)