Skip to content

Commit 1ffd109

Browse files
fix: remove unused imports and improve error handling across multiple scripts
1 parent 3cc822e commit 1ffd109

17 files changed

Lines changed: 64 additions & 65 deletions

File tree

archive-doc-gen/src/backend/settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,11 @@ class _AzureSearchSettings(BaseSettings, DatasourcePayloadConstructor):
266266
extra="ignore",
267267
env_ignore_empty=True,
268268
)
269+
270+
def __init__(self, *args, settings: "_AppSettings", **data):
271+
# Ensure DatasourcePayloadConstructor.__init__ runs so that _settings is initialized
272+
super().__init__(*args, settings=settings, **data)
273+
269274
_type: Literal["azure_search"] = PrivateAttr(default="azure_search")
270275
top_k: int = Field(default=5, serialization_alias="top_n_documents")
271276
strictness: int = 3

archive-doc-gen/src/frontend/src/components/ChatHistory/ChatHistoryListItem.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
DialogType,
88
IconButton,
99
ITextField,
10-
ITooltipHostStyles,
1110
List,
1211
PrimaryButton,
1312
Separator,

archive-doc-gen/src/frontend/src/components/ChatHistory/chatHistoryListItem.test.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,11 +553,10 @@ describe('ChatHistoryListItemCell', () => {
553553
}, 10000)
554554

555555
test('shows error when trying to rename to an existing title', async () => {
556-
const existingTitle = 'Existing Chat Title'
557-
; (historyRename as jest.Mock).mockResolvedValueOnce({
558-
ok: false,
559-
json: async () => ({ message: 'Title already exists' })
560-
})
556+
(historyRename as jest.Mock).mockResolvedValueOnce({
557+
ok: false,
558+
json: async () => ({ message: 'Title already exists' })
559+
})
561560

562561
renderWithContext(<ChatHistoryListItemCell item={conversation} onSelect={mockOnSelect} />, mockAppState)
563562

archive-doc-gen/src/frontend/src/pages/chat/Chat.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import {
66
Dialog,
77
DialogType,
88
Stack,
9-
IStackTokens,
10-
mergeStyleSets,
11-
IModalStyles,
129
Spinner,
1310
SpinnerSize
1411
} from '@fluentui/react'

archive-doc-gen/tests/e2e-test/pages/draftPage.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import time
2-
import os
32
from base.base import BasePage
43
from pytest_check import check
54
from playwright.sync_api import expect

archive-doc-gen/tests/e2e-test/tests/test_st_docgen_tc.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77
from pytest_check import check
88
from playwright.sync_api import expect
9-
from config.constants import (URL, add_section, browse_question1, browse_question2, browse_question3,
9+
from config.constants import (add_section, browse_question1, browse_question2, browse_question3,
1010
browse_question4, browse_question5, generate_question1, invalid_response,
1111
invalid_response1, remove_section)
1212
from pages.browsePage import BrowsePage
@@ -538,7 +538,6 @@ def test_show_hide_chat_history(login_logout, request):
538538

539539
page = login_logout
540540
home_page = HomePage(page)
541-
browse_page = BrowsePage(page)
542541
generate_page = GeneratePage(page)
543542

544543
log_capture = io.StringIO()
@@ -2503,14 +2502,13 @@ def test_bug_7571_removed_sections_not_returning(request, login_logout):
25032502
logger.info("Step 4: Enter a prompt to remove sections one by one 'Remove (section name)'")
25042503
start = time.time()
25052504

2506-
# Select 3 sections to remove from the initial list
2507-
sections_to_remove = []
2508-
if initial_count >= 3:
2509-
# Remove sections at positions 1, 2, and 3 (avoid removing first section for stability)
2510-
indices_to_remove = [1, 2, 3] if initial_count > 3 else list(range(1, initial_count))
2511-
for idx in indices_to_remove:
2512-
if idx < len(initial_sections):
2513-
sections_to_remove.append(initial_sections[idx])
2505+
# Select up to 3 sections to remove from the initial list (avoid removing first section for stability)
2506+
indices_to_remove = [1, 2, 3] if initial_count > 3 else list(range(1, initial_count))
2507+
sections_to_remove = [
2508+
initial_sections[idx]
2509+
for idx in indices_to_remove
2510+
if idx < len(initial_sections)
2511+
]
25142512

25152513
logger.info("Sections selected for removal: %s", sections_to_remove)
25162514

@@ -2739,6 +2737,9 @@ def test_bug_9825_navigate_between_sections(request, login_logout):
27392737

27402738
page.wait_for_timeout(1000)
27412739

2740+
duration = time.time() - start
2741+
logger.info("Execution Time for Step 6: %.2fs", duration)
2742+
27422743
logger.info("\n" + "="*80)
27432744
logger.info("✅ TC 10157 Test Summary - Navigate between sections")
27442745
logger.info("="*80)
@@ -3398,7 +3399,7 @@ def test_bug_10177_edit_delete_icons_disabled_during_response(login_logout, requ
33983399
try:
33993400
threads.first.wait_for(state="visible", timeout=10000)
34003401
logger.info("✅ Chat history created and displayed with %d thread(s)", threads.count())
3401-
except:
3402+
except Exception:
34023403
logger.error("❌ Chat history threads not visible after creation")
34033404
# Try alternative locator
34043405
threads_alt = page.locator('div[data-list-index]')
@@ -3448,7 +3449,7 @@ def test_bug_10177_edit_delete_icons_disabled_during_response(login_logout, requ
34483449
try:
34493450
delete_icon.wait_for(state="visible", timeout=2000)
34503451
is_delete_visible = True
3451-
except:
3452+
except Exception:
34523453
is_delete_visible = False
34533454

34543455
is_delete_enabled = delete_icon.is_enabled() if is_delete_visible else False
@@ -3460,7 +3461,7 @@ def test_bug_10177_edit_delete_icons_disabled_during_response(login_logout, requ
34603461
try:
34613462
edit_icon.wait_for(state="visible", timeout=2000)
34623463
is_edit_visible = True
3463-
except:
3464+
except Exception:
34643465
is_edit_visible = False
34653466

34663467
is_edit_enabled = edit_icon.is_enabled() if is_edit_visible else False
@@ -3914,7 +3915,9 @@ def test_bug_16106_tooltip_on_chat_history_hover(login_logout, request):
39143915
with check:
39153916
assert thread_count > 0, "No chat history threads found to hover over"
39163917

3917-
if thread_count > 0:
3918+
if thread_count <= 0:
3919+
logger.warning("Skipping hover action: no chat history threads available.")
3920+
else:
39183921
# Hover over the first chat thread to trigger tooltip
39193922
first_thread = history_threads.nth(0)
39203923
first_thread.hover()
@@ -3989,8 +3992,6 @@ def test_bug_16106_tooltip_on_chat_history_hover(login_logout, request):
39893992
if tooltip_found:
39903993
logger.info("✅ Tooltip displayed successfully on chat history hover")
39913994
logger.info("Tooltip text length: %d characters", len(tooltip_text))
3992-
else:
3993-
logger.error("❌ BUG FOUND: No tooltip displayed when hovering over chat history")
39943995

39953996
duration = time.time() - start
39963997
logger.info("Execution Time for 'Verify tooltip': %.2fs", duration)
@@ -4007,7 +4008,7 @@ def test_bug_16106_tooltip_on_chat_history_hover(login_logout, request):
40074008
page.keyboard.press("Escape")
40084009
page.wait_for_timeout(1000)
40094010
logger.info("Closed chat history using Escape key")
4010-
except:
4011+
except Exception:
40114012
logger.warning("Chat history panel may still be open")
40124013

40134014
logger.info("\n%s", "="*80)
@@ -4102,10 +4103,10 @@ def test_bug_26031_validate_empty_spaces_chat_input(login_logout, request):
41024103
assert current_responses_empty == initial_responses, \
41034104
f"BUG: System accepted empty query. Response count changed from {initial_responses} to {current_responses_empty}"
41044105

4105-
if current_responses_empty == initial_responses:
4106-
logger.info("✅ System did not accept empty query - no response generated")
4107-
else:
4106+
if current_responses_empty != initial_responses:
41084107
logger.error("❌ BUG: System accepted empty query and generated response")
4108+
else:
4109+
logger.info("✅ System did not accept empty query - no response generated")
41094110
else:
41104111
logger.info("✅ Send button is properly disabled for empty input")
41114112

content-gen/scripts/create_image_search_index.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"""
1111

1212
import asyncio
13-
import json
1413
import os
1514
import sys
1615
from pathlib import Path

content-gen/scripts/post_deploy.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@
3636
import argparse
3737
import asyncio
3838
import base64
39-
import json
4039
import os
4140
import sys
42-
import time
4341
from dataclasses import dataclass
4442
from pathlib import Path
45-
from typing import Optional, List, Dict, Any
43+
from typing import List, Dict, Any
4644

4745
try:
4846
import httpx

content-gen/scripts/sample_content_generation.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import asyncio
2929
import argparse
3030
import json
31-
import os
3231
import sys
3332
from datetime import datetime
3433
from pathlib import Path
@@ -288,7 +287,7 @@ async def main():
288287

289288
# Generate content
290289
try:
291-
result = await generate_content_sample(
290+
await generate_content_sample(
292291
brief=brief,
293292
products=products,
294293
generate_images=not args.no_images,

content-gen/scripts/test_content_generation.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"""
1313

1414
import asyncio
15-
import json
1615
import sys
1716
import os
1817
from typing import Dict, Any

0 commit comments

Comments
 (0)