Remove phi changes

Author: pamelafox

app/backend/app.py

@@ -395,7 +395,7 @@ async def setup_clients():
     AZURE_SEARCH_INDEX = os.environ["AZURE_SEARCH_INDEX"]
     # Shared by all OpenAI deployments
     OPENAI_HOST = os.getenv("OPENAI_HOST", "azure")
-    OPENAI_CHATGPT_MODEL = "phi3.5:latest"
+    OPENAI_CHATGPT_MODEL = os.environ["AZURE_OPENAI_CHATGPT_MODEL"]
     OPENAI_EMB_MODEL = os.getenv("AZURE_OPENAI_EMB_MODEL_NAME", "text-embedding-ada-002")
     OPENAI_EMB_DIMENSIONS = int(os.getenv("AZURE_OPENAI_EMB_DIMENSIONS", 1536))
     # Used with Azure OpenAI deployments
@@ -717,7 +717,7 @@ def create_app():
     # Set our own logger levels to INFO by default
     app_level = os.getenv("APP_LOG_LEVEL", "INFO")
     app.logger.setLevel(os.getenv("APP_LOG_LEVEL", app_level))
-    logging.getLogger("ragapp").setLevel(app_level)
+    logging.getLogger("scripts").setLevel(app_level)
 
     if allowed_origin := os.getenv("ALLOWED_ORIGIN"):
         app.logger.info("ALLOWED_ORIGIN is set, enabling CORS for %s", allowed_origin)

app/backend/approaches/chatreadretrieveread.py

@@ -51,7 +51,7 @@ def __init__(
         self.content_field = content_field
         self.query_language = query_language
         self.query_speller = query_speller
-        self.chatgpt_token_limit = get_token_limit(chatgpt_model, default_to_minimum=True)
+        self.chatgpt_token_limit = get_token_limit(chatgpt_model)
 
     @property
     def system_message_chat_conversation(self):

app/backend/approaches/retrievethenread.py

@@ -66,7 +66,7 @@ def __init__(
         self.content_field = content_field
         self.query_language = query_language
         self.query_speller = query_speller
-        self.chatgpt_token_limit = get_token_limit(chatgpt_model, default_to_minimum=True)
+        self.chatgpt_token_limit = get_token_limit(chatgpt_model)
 
     async def run(
         self,
@@ -121,7 +121,6 @@ async def run(
             few_shots=[{"role": "user", "content": self.question}, {"role": "assistant", "content": self.answer}],
             new_user_content=user_content,
             max_tokens=self.chatgpt_token_limit - response_token_limit,
-            fallback_to_default=True,
         )
 
         chat_completion = await self.openai_client.chat.completions.create(

app/backend/load_azd_env.py

@@ -4,7 +4,7 @@
 
 from dotenv import load_dotenv
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 def load_azd_env():

app/backend/prepdocs.py

@@ -33,7 +33,7 @@
 from prepdocslib.textparser import TextParser
 from prepdocslib.textsplitter import SentenceTextSplitter, SimpleTextSplitter
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 def clean_key_if_exists(key: Union[str, None]) -> Union[str, None]:

app/backend/prepdocslib/blobmanager.py

@@ -18,7 +18,7 @@
 
 from .listfilestrategy import File
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 class BlobManager:

app/backend/prepdocslib/embeddings.py

@@ -17,7 +17,7 @@
 )
 from typing_extensions import TypedDict
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 class EmbeddingBatch:

app/backend/prepdocslib/filestrategy.py

@@ -8,7 +8,7 @@
 from .searchmanager import SearchManager, Section
 from .strategy import DocumentAction, SearchInfo, Strategy
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 async def parse_file(

app/backend/prepdocslib/htmlparser.py

@@ -7,7 +7,7 @@
 from .page import Page
 from .parser import Parser
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 def cleanup_data(data: str) -> str:

app/backend/prepdocslib/integratedvectorizerstrategy.py

@@ -28,7 +28,7 @@
 from .searchmanager import SearchManager
 from .strategy import DocumentAction, SearchInfo, Strategy
 
-logger = logging.getLogger("ragapp")
+logger = logging.getLogger("scripts")
 
 
 class IntegratedVectorizerStrategy(Strategy):