From d2785005c24524a2adbc0cd14fa2bba694fe2320 Mon Sep 17 00:00:00 2001 From: Abdul-Microsoft Date: Mon, 12 May 2025 13:49:22 +0530 Subject: [PATCH 1/3] refactor: clean up imports and remove unused code across multiple files --- .github/workflows/docker-build-and-push.yml | 5 ++++- src/backend/app_config.py | 5 ++--- src/backend/app_kernel.py | 14 ++------------ src/backend/config_kernel.py | 15 --------------- src/backend/context/cosmos_memory_kernel.py | 10 +++++----- src/backend/handlers/runtime_interrupt_kernel.py | 1 - src/backend/kernel_agents/agent_base.py | 8 +------- src/backend/kernel_agents/agent_factory.py | 8 ++------ src/backend/kernel_agents/agent_utils.py | 3 +-- src/backend/kernel_agents/generic_agent.py | 2 -- src/backend/kernel_agents/group_chat_manager.py | 13 +------------ src/backend/kernel_agents/hr_agent.py | 1 - src/backend/kernel_agents/human_agent.py | 9 ++------- src/backend/kernel_agents/marketing_agent.py | 1 - src/backend/kernel_agents/planner_agent.py | 13 ++----------- src/backend/kernel_agents/procurement_agent.py | 1 - src/backend/kernel_agents/product_agent.py | 1 - src/backend/kernel_agents/tech_support_agent.py | 1 - src/backend/kernel_tools/generic_tools.py | 10 +++------- src/backend/kernel_tools/hr_tools.py | 9 +++------ src/backend/kernel_tools/marketing_tools.py | 9 +++------ src/backend/kernel_tools/procurement_tools.py | 7 +++---- src/backend/kernel_tools/product_tools.py | 5 ++--- src/backend/kernel_tools/tech_support_tools.py | 8 +++----- src/backend/models/messages_kernel.py | 2 +- src/backend/utils_kernel.py | 2 -- 26 files changed, 40 insertions(+), 123 deletions(-) diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index a6d2c59a4..decd04ea0 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -7,6 +7,7 @@ on: - dev - demo - hotfix + - feature/pylintfix pull_request: types: - opened @@ -32,7 +33,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Log in to Azure Container Registry - if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }} + if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'feature/pylintfix'}} uses: azure/docker-login@v2 with: login-server: ${{ secrets.ACR_LOGIN_SERVER }} @@ -54,6 +55,8 @@ jobs: echo "TAG=demo" >> $GITHUB_ENV elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then echo "TAG=hotfix" >> $GITHUB_ENV + elif [[ "${{ github.ref }}" == "refs/heads/feature/pylintfix" ]]; then + echo "TAG=hotfix" >> $GITHUB_ENV else echo "TAG=pullrequest-ignore" >> $GITHUB_ENV fi diff --git a/src/backend/app_config.py b/src/backend/app_config.py index b35732a99..f3efbaf4a 100644 --- a/src/backend/app_config.py +++ b/src/backend/app_config.py @@ -1,13 +1,12 @@ # app_config.py import os import logging -from typing import Optional, List, Dict, Any +from typing import Optional, List from dotenv import load_dotenv -from azure.identity import DefaultAzureCredential, ClientSecretCredential +from azure.identity import DefaultAzureCredential from azure.cosmos.aio import CosmosClient from azure.ai.projects.aio import AIProjectClient from semantic_kernel.kernel import Kernel -from semantic_kernel.contents import ChatHistory from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent from semantic_kernel.functions import KernelFunction diff --git a/src/backend/app_kernel.py b/src/backend/app_kernel.py index 674290a26..5275f7adb 100644 --- a/src/backend/app_kernel.py +++ b/src/backend/app_kernel.py @@ -1,21 +1,15 @@ # app_kernel.py import asyncio -import json import logging -import os -import re import uuid -from typing import Any, Dict, List, Optional +from typing import Dict, List, Optional # Semantic Kernel imports -import semantic_kernel as sk from app_config import config from auth.auth_utils import get_authenticated_user_details # Azure monitoring -from azure.monitor.opentelemetry import configure_azure_monitor from config_kernel import Config -from context.cosmos_memory_kernel import CosmosMemoryContext from event_utils import track_event_if_configured # FastAPI imports @@ -26,21 +20,17 @@ # Local imports from middleware.health_check import HealthCheckMiddleware from models.messages_kernel import ( - ActionRequest, - ActionResponse, AgentMessage, AgentType, HumanClarification, HumanFeedback, InputTask, - Plan, PlanWithSteps, Step, ) # Updated import for KernelArguments -from semantic_kernel.functions.kernel_arguments import KernelArguments -from utils_kernel import get_agents, initialize_runtime_and_context, rai_success +from utils_kernel import initialize_runtime_and_context, rai_success # # Check if the Application Insights Instrumentation Key is set in the environment variables # connection_string = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING") diff --git a/src/backend/config_kernel.py b/src/backend/config_kernel.py index 31ee1ea9a..6227292dd 100644 --- a/src/backend/config_kernel.py +++ b/src/backend/config_kernel.py @@ -1,18 +1,3 @@ -# config_kernel.py -import os -import logging -import semantic_kernel as sk -from semantic_kernel.kernel import Kernel - -# Updated imports for compatibility -try: - # Try newer structure - from semantic_kernel.contents import ChatHistory -except ImportError: - # Fall back to older structure for compatibility - from semantic_kernel.connectors.ai.chat_completion_client import ChatHistory -from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent - # Import AppConfig from app_config from app_config import config diff --git a/src/backend/context/cosmos_memory_kernel.py b/src/backend/context/cosmos_memory_kernel.py index ec8e47dee..7893e8bcb 100644 --- a/src/backend/context/cosmos_memory_kernel.py +++ b/src/backend/context/cosmos_memory_kernel.py @@ -525,8 +525,8 @@ async def get_collections(self) -> List[str]: try: query = """ - SELECT DISTINCT c.collection - FROM c + SELECT DISTINCT c.collection + FROM c WHERE c.data_type = 'memory' AND c.session_id = @session_id """ parameters = [{"name": "@session_id", "value": self.session_id}] @@ -595,7 +595,7 @@ async def get_memory_record( ) -> Optional[MemoryRecord]: """Retrieve a memory record.""" query = """ - SELECT * FROM c + SELECT * FROM c WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type """ parameters = [ @@ -625,7 +625,7 @@ async def get_memory_record( async def remove_memory_record(self, collection: str, key: str) -> None: """Remove a memory record.""" query = """ - SELECT c.id FROM c + SELECT c.id FROM c WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type """ parameters = [ @@ -668,7 +668,7 @@ async def get_memory_records( query = """ SELECT * FROM c - WHERE c.collection = @collection + WHERE c.collection = @collection AND c.data_type = 'memory' AND c.session_id = @session_id ORDER BY c._ts DESC diff --git a/src/backend/handlers/runtime_interrupt_kernel.py b/src/backend/handlers/runtime_interrupt_kernel.py index dfa02524b..2965457ab 100644 --- a/src/backend/handlers/runtime_interrupt_kernel.py +++ b/src/backend/handlers/runtime_interrupt_kernel.py @@ -1,7 +1,6 @@ from typing import Any, Dict, List, Optional import semantic_kernel as sk -from semantic_kernel.kernel_arguments import KernelArguments from semantic_kernel.kernel_pydantic import KernelBaseModel diff --git a/src/backend/kernel_agents/agent_base.py b/src/backend/kernel_agents/agent_base.py index 69154c9ea..a9b2a4d3a 100644 --- a/src/backend/kernel_agents/agent_base.py +++ b/src/backend/kernel_agents/agent_base.py @@ -1,14 +1,8 @@ -import json import logging -import os -from typing import Any, Awaitable, Callable, Dict, List, Mapping, Optional, Union +from typing import Any, List, Mapping, Optional -import semantic_kernel as sk from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent from semantic_kernel.functions import KernelFunction -from semantic_kernel.functions.kernel_arguments import KernelArguments -from semantic_kernel.functions.kernel_function_decorator import kernel_function -from semantic_kernel.agents import AzureAIAgentThread # Import the new AppConfig instance diff --git a/src/backend/kernel_agents/agent_factory.py b/src/backend/kernel_agents/agent_factory.py index 6fa17ff63..6f61b33d6 100644 --- a/src/backend/kernel_agents/agent_factory.py +++ b/src/backend/kernel_agents/agent_factory.py @@ -1,10 +1,7 @@ """Factory for creating agents in the Multi-Agent Custom Automation Engine.""" import logging -from typing import Dict, List, Callable, Any, Optional, Type -from types import SimpleNamespace -from semantic_kernel import Kernel -from semantic_kernel.functions import KernelFunction +from typing import Dict, Any, Optional, Type from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent import inspect @@ -23,7 +20,6 @@ from kernel_agents.product_agent import ProductAgent from kernel_agents.planner_agent import PlannerAgent # Add PlannerAgent import from kernel_agents.group_chat_manager import GroupChatManager -from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfig from context.cosmos_memory_kernel import CosmosMemoryContext from models.messages_kernel import PlannerResponsePlan, AgentType @@ -216,7 +212,7 @@ async def create_agent( if hasattr(agent, "async_init") and inspect.iscoroutinefunction( agent.async_init ): - init_result = await agent.async_init() + await agent.async_init() except Exception as e: logger.error( diff --git a/src/backend/kernel_agents/agent_utils.py b/src/backend/kernel_agents/agent_utils.py index ee16c3dba..8d5ab5b95 100644 --- a/src/backend/kernel_agents/agent_utils.py +++ b/src/backend/kernel_agents/agent_utils.py @@ -2,8 +2,7 @@ from typing import Optional import semantic_kernel as sk -from semantic_kernel.kernel_pydantic import KernelBaseModel -from pydantic import BaseModel, Field +from pydantic import BaseModel from context.cosmos_memory_kernel import CosmosMemoryContext from models.messages_kernel import Step diff --git a/src/backend/kernel_agents/generic_agent.py b/src/backend/kernel_agents/generic_agent.py index 17c7c8eeb..f86bd947e 100644 --- a/src/backend/kernel_agents/generic_agent.py +++ b/src/backend/kernel_agents/generic_agent.py @@ -1,7 +1,5 @@ -import logging from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.generic_tools import GenericTools diff --git a/src/backend/kernel_agents/group_chat_manager.py b/src/backend/kernel_agents/group_chat_manager.py index c24807fda..a5f53eeb8 100644 --- a/src/backend/kernel_agents/group_chat_manager.py +++ b/src/backend/kernel_agents/group_chat_manager.py @@ -1,28 +1,17 @@ import logging -import json from datetime import datetime -import re -from typing import Dict, List, Optional, Any, Tuple +from typing import Dict, List, Optional -import semantic_kernel as sk from semantic_kernel.functions.kernel_function import KernelFunction -from semantic_kernel.agents import AgentGroupChat # pylint: disable=E0611 - -from semantic_kernel.agents.strategies import ( - SequentialSelectionStrategy, - TerminationStrategy, -) from kernel_agents.agent_base import BaseAgent from context.cosmos_memory_kernel import CosmosMemoryContext from models.messages_kernel import ( ActionRequest, - ActionResponse, AgentMessage, HumanFeedback, Step, StepStatus, - PlanStatus, HumanFeedbackStatus, InputTask, Plan, diff --git a/src/backend/kernel_agents/hr_agent.py b/src/backend/kernel_agents/hr_agent.py index 2957ca2c7..f82181a08 100644 --- a/src/backend/kernel_agents/hr_agent.py +++ b/src/backend/kernel_agents/hr_agent.py @@ -1,6 +1,5 @@ from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.hr_tools import HrTools diff --git a/src/backend/kernel_agents/human_agent.py b/src/backend/kernel_agents/human_agent.py index 9aa22a946..ba66ebcdf 100644 --- a/src/backend/kernel_agents/human_agent.py +++ b/src/backend/kernel_agents/human_agent.py @@ -1,22 +1,17 @@ -import logging from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from event_utils import track_event_if_configured from kernel_agents.agent_base import BaseAgent from models.messages_kernel import ( - ActionRequest, AgentMessage, AgentType, ApprovalRequest, HumanClarification, HumanFeedback, - Step, StepStatus, ) from semantic_kernel.functions import KernelFunction -from semantic_kernel.functions.kernel_arguments import KernelArguments class HumanAgent(BaseAgent): @@ -119,7 +114,7 @@ async def handle_human_feedback(self, human_feedback: HumanFeedback) -> str: # Track the event track_event_if_configured( - f"Human Agent - Received feedback for step and added into the cosmos", + "Human Agent - Received feedback for step and added into the cosmos", { "session_id": human_feedback.session_id, "user_id": self._user_id, @@ -143,7 +138,7 @@ async def handle_human_feedback(self, human_feedback: HumanFeedback) -> str: # Track the approval request event track_event_if_configured( - f"Human Agent - Approval request sent for step and added into the cosmos", + "Human Agent - Approval request sent for step and added into the cosmos", { "session_id": human_feedback.session_id, "user_id": self._user_id, diff --git a/src/backend/kernel_agents/marketing_agent.py b/src/backend/kernel_agents/marketing_agent.py index 8c1ed80cd..aa4e542e9 100644 --- a/src/backend/kernel_agents/marketing_agent.py +++ b/src/backend/kernel_agents/marketing_agent.py @@ -1,6 +1,5 @@ from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.marketing_tools import MarketingTools diff --git a/src/backend/kernel_agents/planner_agent.py b/src/backend/kernel_agents/planner_agent.py index 677821547..b28b492c3 100644 --- a/src/backend/kernel_agents/planner_agent.py +++ b/src/backend/kernel_agents/planner_agent.py @@ -1,22 +1,13 @@ import logging import uuid -import json -import re -import datetime -from typing import Dict, List, Optional, Any, Tuple -from pydantic import BaseModel, Field +from typing import Dict, List, Optional, Tuple from azure.ai.projects.models import ( ResponseFormatJsonSchema, ResponseFormatJsonSchemaType, ) -import semantic_kernel as sk from semantic_kernel.functions import KernelFunction from semantic_kernel.functions.kernel_arguments import KernelArguments -from semantic_kernel.agents import ( - AzureAIAgent, - AzureAIAgentSettings, - AzureAIAgentThread, -) + from kernel_agents.agent_base import BaseAgent from context.cosmos_memory_kernel import CosmosMemoryContext from models.messages_kernel import ( diff --git a/src/backend/kernel_agents/procurement_agent.py b/src/backend/kernel_agents/procurement_agent.py index cc3261c35..ed22cc971 100644 --- a/src/backend/kernel_agents/procurement_agent.py +++ b/src/backend/kernel_agents/procurement_agent.py @@ -1,6 +1,5 @@ from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.procurement_tools import ProcurementTools diff --git a/src/backend/kernel_agents/product_agent.py b/src/backend/kernel_agents/product_agent.py index 6251de25e..583b8838b 100644 --- a/src/backend/kernel_agents/product_agent.py +++ b/src/backend/kernel_agents/product_agent.py @@ -1,6 +1,5 @@ from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.product_tools import ProductTools diff --git a/src/backend/kernel_agents/tech_support_agent.py b/src/backend/kernel_agents/tech_support_agent.py index b2c90b872..55fa9ed8e 100644 --- a/src/backend/kernel_agents/tech_support_agent.py +++ b/src/backend/kernel_agents/tech_support_agent.py @@ -1,6 +1,5 @@ from typing import List, Optional -import semantic_kernel as sk from context.cosmos_memory_kernel import CosmosMemoryContext from kernel_agents.agent_base import BaseAgent from kernel_tools.tech_support_tools import TechSupportTools diff --git a/src/backend/kernel_tools/generic_tools.py b/src/backend/kernel_tools/generic_tools.py index 407fe82aa..3cf8b084d 100644 --- a/src/backend/kernel_tools/generic_tools.py +++ b/src/backend/kernel_tools/generic_tools.py @@ -1,14 +1,10 @@ import inspect -import time -import logging -from datetime import datetime -from typing import Annotated, Callable, List +from typing import Callable from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect import json -from typing import Any, Dict, List, get_type_hints +from typing import get_type_hints class GenericTools: @@ -116,7 +112,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/kernel_tools/hr_tools.py b/src/backend/kernel_tools/hr_tools.py index 6e712c0c1..7eb74c4f4 100644 --- a/src/backend/kernel_tools/hr_tools.py +++ b/src/backend/kernel_tools/hr_tools.py @@ -1,13 +1,10 @@ import inspect -import time -from datetime import datetime -from typing import Annotated, Callable, List +from typing import Annotated, Callable from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect import json -from typing import Any, Dict, List, get_type_hints +from typing import get_type_hints class HrTools: @@ -467,7 +464,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/kernel_tools/marketing_tools.py b/src/backend/kernel_tools/marketing_tools.py index 5851e75c0..ac154a3f6 100644 --- a/src/backend/kernel_tools/marketing_tools.py +++ b/src/backend/kernel_tools/marketing_tools.py @@ -1,15 +1,12 @@ """MarketingTools class provides various marketing functions for a marketing agent.""" import inspect -from typing import Callable, List +import json +from typing import Callable, List, get_type_hints from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect -import json -from typing import Any, Dict, List, get_type_hints - class MarketingTools: """A class that provides various marketing tools and functions.""" @@ -345,7 +342,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/kernel_tools/procurement_tools.py b/src/backend/kernel_tools/procurement_tools.py index 2b680724b..64fd23250 100644 --- a/src/backend/kernel_tools/procurement_tools.py +++ b/src/backend/kernel_tools/procurement_tools.py @@ -1,11 +1,10 @@ import inspect -from typing import Annotated, Callable, List, Dict +from typing import Annotated, Callable from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect import json -from typing import Any, Dict, List, get_type_hints +from typing import get_type_hints class ProcurementTools: @@ -619,7 +618,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/kernel_tools/product_tools.py b/src/backend/kernel_tools/product_tools.py index a406a76b0..3e43a1fa4 100644 --- a/src/backend/kernel_tools/product_tools.py +++ b/src/backend/kernel_tools/product_tools.py @@ -7,9 +7,8 @@ from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect import json -from typing import Any, Dict, List, get_type_hints +from typing import get_type_hints class ProductTools: @@ -672,7 +671,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/kernel_tools/tech_support_tools.py b/src/backend/kernel_tools/tech_support_tools.py index ad116a775..6e8a21c84 100644 --- a/src/backend/kernel_tools/tech_support_tools.py +++ b/src/backend/kernel_tools/tech_support_tools.py @@ -1,11 +1,9 @@ import inspect -from typing import Annotated, Callable, Dict +from typing import Callable, get_type_hints +import json from semantic_kernel.functions import kernel_function from models.messages_kernel import AgentType -import inspect -import json -from typing import Any, Dict, List, get_type_hints class TechSupportTools: @@ -362,7 +360,7 @@ def generate_tools_json_doc(cls) -> str: param_type = "string" # Create parameter description - param_desc = param_name.replace("_", " ") + # param_desc = param_name.replace("_", " ") args_dict[param_name] = { "description": param_name, "title": param_name.replace("_", " ").title(), diff --git a/src/backend/models/messages_kernel.py b/src/backend/models/messages_kernel.py index 32e68cf8f..ac10f8e25 100644 --- a/src/backend/models/messages_kernel.py +++ b/src/backend/models/messages_kernel.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime,timezone +from datetime import datetime, timezone from enum import Enum from typing import Any, Dict, List, Literal, Optional diff --git a/src/backend/utils_kernel.py b/src/backend/utils_kernel.py index 9fcc01e44..22a49cd1c 100644 --- a/src/backend/utils_kernel.py +++ b/src/backend/utils_kernel.py @@ -16,7 +16,6 @@ # Import agent factory and the new AppConfig from kernel_agents.agent_factory import AgentFactory -from kernel_agents.generic_agent import GenericAgent from kernel_agents.group_chat_manager import GroupChatManager from kernel_agents.hr_agent import HrAgent from kernel_agents.human_agent import HumanAgent @@ -27,7 +26,6 @@ from kernel_agents.tech_support_agent import TechSupportAgent from models.messages_kernel import AgentType from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent -from semantic_kernel.functions import KernelFunction logging.basicConfig(level=logging.INFO) From b29ef604da2db0b5416a7021f9a69ff230498877 Mon Sep 17 00:00:00 2001 From: Abdul-Microsoft Date: Mon, 12 May 2025 14:42:19 +0530 Subject: [PATCH 2/3] remove feature branch from workflow triggers --- .github/workflows/docker-build-and-push.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index decd04ea0..a6d2c59a4 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -7,7 +7,6 @@ on: - dev - demo - hotfix - - feature/pylintfix pull_request: types: - opened @@ -33,7 +32,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Log in to Azure Container Registry - if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'feature/pylintfix'}} + if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }} uses: azure/docker-login@v2 with: login-server: ${{ secrets.ACR_LOGIN_SERVER }} @@ -55,8 +54,6 @@ jobs: echo "TAG=demo" >> $GITHUB_ENV elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then echo "TAG=hotfix" >> $GITHUB_ENV - elif [[ "${{ github.ref }}" == "refs/heads/feature/pylintfix" ]]; then - echo "TAG=hotfix" >> $GITHUB_ENV else echo "TAG=pullrequest-ignore" >> $GITHUB_ENV fi From 9684ba22bbf03e67fda025f1989abc7c1dec303a Mon Sep 17 00:00:00 2001 From: Abdul-Microsoft Date: Tue, 13 May 2025 09:44:47 +0530 Subject: [PATCH 3/3] fix: update flake8 to exclude the unit testing folder --- .flake8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.flake8 b/.flake8 index 08367ecdc..5b72c2abb 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ [flake8] max-line-length = 88 extend-ignore = E501 -exclude = .venv, frontend +exclude = .venv, frontend, src/backend/tests ignore = E203, W503, G004, G200, E402 \ No newline at end of file