refactor: change passwords to pydantic SecretStr

Author: lpm0073

models/conf.py

@@ -20,7 +20,7 @@
 from typing import Any, Dict, List, Optional
 
 from dotenv import load_dotenv
-from pydantic import Field, ValidationError, validator
+from pydantic import Field, SecretStr, ValidationError, validator
 from pydantic_settings import BaseSettings
 
 from models.const import HERE
@@ -156,7 +156,7 @@ def __init__(self, **data: Any):
     openai_api_organization: Optional[str] = Field(
         SettingsDefaults.OPENAI_API_ORGANIZATION, env="OPENAI_API_ORGANIZATION"
     )
-    openai_api_key: Optional[str] = Field(SettingsDefaults.OPENAI_API_KEY, env="OPENAI_API_KEY")
+    openai_api_key: Optional[SecretStr] = Field(SettingsDefaults.OPENAI_API_KEY, env="OPENAI_API_KEY")
     openai_endpoint_image_n: Optional[int] = Field(
         SettingsDefaults.OPENAI_ENDPOINT_IMAGE_N, env="OPENAI_ENDPOINT_IMAGE_N"
     )
@@ -180,7 +180,7 @@ def __init__(self, **data: Any):
         SettingsDefaults.OPENAI_CHAT_MAX_RETRIES, env="OPENAI_CHAT_MAX_RETRIES"
     )
 
-    pinecone_api_key: Optional[str] = Field(SettingsDefaults.PINECONE_API_KEY, env="PINECONE_API_KEY")
+    pinecone_api_key: Optional[SecretStr] = Field(SettingsDefaults.PINECONE_API_KEY, env="PINECONE_API_KEY")
     pinecone_environment: Optional[str] = Field(SettingsDefaults.PINECONE_ENVIRONMENT, env="PINECONE_ENVIRONMENT")
     pinecone_index_name: Optional[str] = Field(SettingsDefaults.PINECONE_INDEX_NAME, env="PINECONE_INDEX_NAME")
     pinecone_vectorstore_text_key: Optional[str] = Field(

models/hybrid_search_retreiver.py

@@ -69,7 +69,7 @@ def chat(self) -> ChatOpenAI:
         """ChatOpenAI lazy read-only property."""
         if self._chat is None:
             self._chat = ChatOpenAI(
-                api_key=settings.openai_api_key,
+                api_key=settings.openai_api_key.get_secret_value(),  # pylint: disable=no-member
                 organization=settings.openai_api_organization,
                 cache=settings.openai_chat_cache,
                 max_retries=settings.openai_chat_max_retries,
@@ -114,7 +114,11 @@ def prompt_with_template(
         self, prompt: PromptTemplate, concept: str, model: str = settings.openai_prompt_model_name
     ) -> str:
         """Prompt with template."""
-        llm = OpenAI(model=model, api_key=settings.openai_api_key, organization=settings.openai_api_organization)
+        llm = OpenAI(
+            model=model,
+            api_key=settings.openai_api_key.get_secret_value(),  # pylint: disable=no-member
+            organization=settings.openai_api_organization,
+        )
         retval = llm(prompt.format(concept=concept))
         return retval
 

models/pinecone.py

@@ -105,8 +105,10 @@ def vector_store(self) -> LCPinecone:
     def openai_embeddings(self) -> OpenAIEmbeddings:
         """OpenAIEmbeddings lazy read-only property."""
         if self._openai_embeddings is None:
+            # pylint: disable=no-member
             self._openai_embeddings = OpenAIEmbeddings(
-                api_key=settings.openai_api_key, organization=settings.openai_api_organization
+                api_key=settings.openai_api_key.get_secret_value(),
+                organization=settings.openai_api_organization,
             )
         return self._openai_embeddings
 
@@ -126,7 +128,8 @@ def init_index(self):
 
     def init(self):
         """Initialize Pinecone."""
-        pinecone.init(api_key=settings.pinecone_api_key, environment=settings.pinecone_environment)
+        # pylint: disable=no-member
+        pinecone.init(api_key=settings.pinecone_api_key.get_secret_value(), environment=settings.pinecone_environment)
         self._index = None
         self._index_name = None
         self._text_splitter = None

models/yt.py

@@ -66,7 +66,10 @@ class LangChainDev:
         tool=PythonREPL(),
         verbose=True,
     )
-    pinecone.init(api_key=settings.pinecone_api_key, environment=settings.pinecone_environment)  # minute 10:43
+    # pylint: disable=no-member
+    pinecone.init(
+        api_key=settings.pinecone_api_key.get_secret_value(), environment=settings.pinecone_environment
+    )  # minute 10:43
 
     # LLM wrappers. minute 5:46
     def test_01_basic(self):