Skip to content

Commit 34247c2

Browse files
author
Shreyas-Microsoft
committed
fix pylint
1 parent 5f3d6c4 commit 34247c2

3 files changed

Lines changed: 84 additions & 84 deletions

File tree

‎src/backend/app.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent # pylint: disable=E0611
1717

18+
from sql_agents.agent_manager import clear_sql_agents, set_sql_agents
1819
from sql_agents.agents.agent_config import AgentBaseConfig
1920
from sql_agents.helpers.agents_manager import SqlAgents
20-
from sql_agents.agent_manager import set_sql_agents, clear_sql_agents
2121

2222
import uvicorn
2323
# from agent_services.agents_routes import router as agents_router
@@ -37,51 +37,51 @@
3737
async def lifespan(app: FastAPI):
3838
"""Manage application lifespan - startup and shutdown."""
3939
global sql_agents, azure_client
40-
40+
4141
# Startup
4242
try:
4343
logger.logger.info("Initializing SQL agents...")
44-
44+
4545
# Create Azure credentials and client
4646
creds = DefaultAzureCredential()
4747
azure_client = AzureAIAgent.create_client(
48-
credential=creds,
48+
credential=creds,
4949
endpoint=app_config.ai_project_endpoint
5050
)
51-
51+
5252
# Setup agent configuration with default conversion settings
5353
agent_config = AgentBaseConfig(
5454
project_client=azure_client,
5555
sql_from="informix", # Default source dialect
5656
sql_to="tsql" # Default target dialect
5757
)
58-
58+
5959
# Create SQL agents
6060
sql_agents = await SqlAgents.create(agent_config)
61-
61+
6262
# Set the global agents instance
6363
set_sql_agents(sql_agents)
6464
logger.logger.info("SQL agents initialized successfully.")
65-
65+
6666
except Exception as exc:
6767
logger.logger.error("Failed to initialize SQL agents: %s", exc)
6868
# Don't raise the exception to allow the app to start even if agents fail
69-
69+
7070
yield # Application runs here
71-
71+
7272
# Shutdown
7373
try:
7474
if sql_agents:
7575
logger.logger.info("Application shutting down - cleaning up SQL agents...")
7676
await sql_agents.delete_agents()
7777
logger.logger.info("SQL agents cleaned up successfully.")
78-
78+
7979
# Clear the global agents instance
8080
await clear_sql_agents()
81-
81+
8282
if azure_client:
8383
await azure_client.close()
84-
84+
8585
except Exception as exc:
8686
logger.logger.error("Error during agent cleanup: %s", exc)
8787

‎src/backend/sql_agents/convert_script.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async def convert_script(
5050
initial_delay=1.0, # Start with 1 second delay
5151
backoff_factor=2.0, # Double delay each retry
5252
)
53-
53+
5454
try:
5555
# send websocket notification that file processing has started
5656
send_status_update(
@@ -282,7 +282,7 @@ async def convert_script(
282282
)
283283

284284
return migrated_query
285-
285+
286286
finally:
287287
# Clean up threads and communication resources - guaranteed to run
288288
try:

‎src/backend/sql_agents/process_batch.py‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import logging
88

99
from api.status_updates import send_status_update
10-
from sql_agents.agent_manager import get_sql_agents, update_agent_config
1110

1211
from common.models.api import (
1312
FileProcessUpdate,
@@ -24,6 +23,7 @@
2423
from semantic_kernel.contents import AuthorRole
2524
from semantic_kernel.exceptions.service_exceptions import ServiceResponseException
2625

26+
from sql_agents.agent_manager import get_sql_agents, update_agent_config
2727
from sql_agents.convert_script import convert_script
2828
from sql_agents.helpers.models import AgentType
2929
from sql_agents.helpers.utils import is_text
@@ -65,77 +65,77 @@ async def process_batch_async(
6565
# Send file to the agents for processing
6666
# Send status update to the client of type in progress, completed, or failed
6767
for file in batch_files:
68-
# Get the file from blob storage
68+
# Get the file from blob storage
69+
try:
70+
file_record = FileRecord.fromdb(file)
71+
# Update the file status
6972
try:
70-
file_record = FileRecord.fromdb(file)
71-
# Update the file status
72-
try:
73-
file_record.status = ProcessStatus.IN_PROGRESS
74-
await batch_service.update_file_record(file_record)
75-
except Exception as exc:
76-
logger.error("Error updating file status. %s", exc)
77-
78-
sql_in_file = await storage.get_file(file_record.blob_path)
79-
80-
# split into base validation routine
81-
# Check if the file is a valid text file <--
82-
if not is_text(sql_in_file):
83-
logger.error("File is not a valid text file. Skipping.")
84-
# insert data base write to file record stating invalid file
85-
await batch_service.create_file_log(
86-
str(file_record.file_id),
87-
"File is not a valid text file. Skipping.",
88-
"",
89-
LogType.ERROR,
90-
AgentType.ALL,
91-
AuthorRole.ASSISTANT,
92-
)
93-
# send status update to the client of type failed
94-
send_status_update(
95-
status=FileProcessUpdate(
96-
file_record.batch_id,
97-
file_record.file_id,
98-
ProcessStatus.COMPLETED,
99-
file_result=FileResult.ERROR,
100-
),
101-
)
102-
file_record.file_result = FileResult.ERROR
103-
file_record.status = ProcessStatus.COMPLETED
104-
file_record.error_count = 1
105-
await batch_service.update_file_record(file_record)
106-
continue
107-
else:
108-
logger.info("sql_in_file: %s", sql_in_file)
109-
110-
# Convert the file
111-
converted_query = await convert_script(
112-
sql_in_file,
113-
file_record,
114-
batch_service,
115-
sql_agents,
116-
)
117-
if converted_query:
118-
# Add RAI disclaimer to the converted query
119-
converted_query = add_rai_disclaimer(converted_query)
120-
await batch_service.create_candidate(
121-
file["file_id"], converted_query
122-
)
123-
else:
124-
await batch_service.update_file_counts(file["file_id"])
125-
except UnicodeDecodeError as ucde:
126-
logger.error("Error decoding file: %s", file)
127-
logger.error("Error decoding file. %s", ucde)
128-
await process_error(ucde, file_record, batch_service)
129-
except ServiceResponseException as sre:
130-
logger.error(file)
131-
logger.error("Error processing file. %s", sre)
132-
# insert data base write to file record stating invalid file
133-
await process_error(sre, file_record, batch_service)
73+
file_record.status = ProcessStatus.IN_PROGRESS
74+
await batch_service.update_file_record(file_record)
13475
except Exception as exc:
135-
logger.error(file)
136-
logger.error("Error processing file. %s", exc)
76+
logger.error("Error updating file status. %s", exc)
77+
78+
sql_in_file = await storage.get_file(file_record.blob_path)
79+
80+
# split into base validation routine
81+
# Check if the file is a valid text file <--
82+
if not is_text(sql_in_file):
83+
logger.error("File is not a valid text file. Skipping.")
13784
# insert data base write to file record stating invalid file
138-
await process_error(exc, file_record, batch_service)
85+
await batch_service.create_file_log(
86+
str(file_record.file_id),
87+
"File is not a valid text file. Skipping.",
88+
"",
89+
LogType.ERROR,
90+
AgentType.ALL,
91+
AuthorRole.ASSISTANT,
92+
)
93+
# send status update to the client of type failed
94+
send_status_update(
95+
status=FileProcessUpdate(
96+
file_record.batch_id,
97+
file_record.file_id,
98+
ProcessStatus.COMPLETED,
99+
file_result=FileResult.ERROR,
100+
),
101+
)
102+
file_record.file_result = FileResult.ERROR
103+
file_record.status = ProcessStatus.COMPLETED
104+
file_record.error_count = 1
105+
await batch_service.update_file_record(file_record)
106+
continue
107+
else:
108+
logger.info("sql_in_file: %s", sql_in_file)
109+
110+
# Convert the file
111+
converted_query = await convert_script(
112+
sql_in_file,
113+
file_record,
114+
batch_service,
115+
sql_agents,
116+
)
117+
if converted_query:
118+
# Add RAI disclaimer to the converted query
119+
converted_query = add_rai_disclaimer(converted_query)
120+
await batch_service.create_candidate(
121+
file["file_id"], converted_query
122+
)
123+
else:
124+
await batch_service.update_file_counts(file["file_id"])
125+
except UnicodeDecodeError as ucde:
126+
logger.error("Error decoding file: %s", file)
127+
logger.error("Error decoding file. %s", ucde)
128+
await process_error(ucde, file_record, batch_service)
129+
except ServiceResponseException as sre:
130+
logger.error(file)
131+
logger.error("Error processing file. %s", sre)
132+
# insert data base write to file record stating invalid file
133+
await process_error(sre, file_record, batch_service)
134+
except Exception as exc:
135+
logger.error(file)
136+
logger.error("Error processing file. %s", exc)
137+
# insert data base write to file record stating invalid file
138+
await process_error(exc, file_record, batch_service)
139139

140140
# Update batch status to completed or failed
141141
try:

0 commit comments

Comments
 (0)