Skip to content

Commit 3e71fe1

Browse files
authored
Switch print statements to use logger (#640)
* Switch print statements to use logger Required by #637 * Fix log format
1 parent c3a4eb5 commit 3e71fe1

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

code/backend/batch/utilities/helpers/ConfigHelper.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import json
2+
import logging
23
from .AzureBlobStorageHelper import AzureBlobStorageClient
34
from ..document_chunking.Strategies import ChunkingSettings, ChunkingStrategy
45
from ..document_loading import LoadingSettings, LoadingStrategy
@@ -10,6 +11,7 @@
1011
from .EnvHelper import EnvHelper
1112

1213
CONFIG_CONTAINER_NAME = "config"
14+
logger = logging.getLogger(__name__)
1315

1416

1517
class Config:
@@ -81,7 +83,7 @@ def get_active_config_or_default():
8183
config_file = blob_client.download_file("active.json")
8284
config = Config(json.loads(config_file))
8385
except Exception:
84-
print("Returning default config")
86+
logger.info("Returning default config")
8587

8688
return config
8789

code/backend/batch/utilities/orchestrator/OrchestratorBase.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
# Create an abstract class for orchestrator
1+
import logging
22
from uuid import uuid4
33
from typing import List, Optional
44
from abc import ABC, abstractmethod
55
from ..loggers.TokenLogger import TokenLogger
66
from ..loggers.ConversationLogger import ConversationLogger
77
from ..helpers.ConfigHelper import ConfigHelper
88

9+
logger = logging.getLogger(__name__)
10+
911

1012
class OrchestratorBase(ABC):
1113
def __init__(self) -> None:
1214
super().__init__()
1315
self.config = ConfigHelper.get_active_config_or_default()
1416
self.message_id = str(uuid4())
1517
self.tokens = {"prompt": 0, "completion": 0, "total": 0}
16-
print(f"New message id: {self.message_id} with tokens {self.tokens}")
18+
logger.debug(f"New message id: {self.message_id} with tokens {self.tokens}")
1719
self.token_logger: TokenLogger = TokenLogger()
1820
self.conversation_logger: ConversationLogger = ConversationLogger()
1921

code/backend/batch/utilities/parser/OutputParserTool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def parse(
6161
continue
6262

6363
doc = source_documents[idx]
64-
print(f"doc{idx}", doc)
64+
logger.debug(f"doc{idx}: {doc}")
6565

6666
# Then update the citation object in the response, it needs to have filepath and chunk_id to render in the UI as a file
6767
messages[0]["content"]["citations"].append(

code/backend/batch/utilities/tools/ContentSafetyChecker.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import logging
12
from azure.ai.contentsafety import ContentSafetyClient
23
from azure.core.credentials import AzureKeyCredential
34
from azure.identity import DefaultAzureCredential
@@ -7,6 +8,8 @@
78
from .AnswerProcessingBase import AnswerProcessingBase
89
from ..common.Answer import Answer
910

11+
logger = logging.getLogger(__name__)
12+
1013

1114
class ContentSafetyChecker(AnswerProcessingBase):
1215
def __init__(self):
@@ -47,12 +50,12 @@ def _filter_text_and_replace(self, text, response_template):
4750
try:
4851
response = self.content_safety_client.analyze_text(request)
4952
except HttpResponseError as e:
50-
print("Analyze text failed.")
5153
if e.error:
52-
print(f"Error code: {e.error.code}")
53-
print(f"Error message: {e.error.message}")
54+
logger.error(
55+
f"Analyze text failed. Error code: {e.error.code}. Error message: {e.error.message}."
56+
)
5457
raise
55-
print(e)
58+
logger.exception("Analyze text failed.")
5659
raise
5760

5861
filtered_text = text

code/backend/batch/utilities/tools/QuestionAnswerTool.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import logging
12
from typing import List
23
from .AnsweringToolBase import AnsweringToolBase
34

@@ -11,6 +12,8 @@
1112
from ..common.Answer import Answer
1213
from ..common.SourceDocument import SourceDocument
1314

15+
logger = logging.getLogger(__name__)
16+
1417

1518
class QuestionAnswerTool(AnsweringToolBase):
1619
def __init__(self) -> None:
@@ -44,7 +47,7 @@ def answer_question(self, question: str, chat_history: List[dict], **kwargs: dic
4447
result = answer_generator({"question": question, "sources": sources_text})
4548

4649
answer = result["text"]
47-
print(f"Answer: {answer}")
50+
logger.debug(f"Answer: {answer}")
4851

4952
# Generate Answer Object
5053
source_documents = []

0 commit comments

Comments
 (0)