cwyodmodules 0.3.24__tar.gz → 0.3.26__tar.gz

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.24
+Version: 0.3.26
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/chat_history/postgresdbservice.py

@@ -28,10 +28,8 @@ class PostgresConversationClient(DatabaseClientBase):
     async def connect(self):
         with tracer.start_as_current_span("PostgresConversationClient.connect"):
             try:
-                credential = self.azure_identity_helper.get_credential()
-                token = credential.get_token(
-                    "https://ossrdbms-aad.database.windows.net/.default"
-                ).token
+                access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+                token = access_information.token
                 self.conn = await asyncpg.connect(
                     user=self.user,
                     host=self.host,

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py

@@ -56,8 +56,8 @@ class AzureComputerVisionClient:
             if self.use_keys:
                 headers["Ocp-Apim-Subscription-Key"] = self.key
             else:
-                token_provider = self.azure_identity_helper.get_token_provider(url=self.__TOKEN_SCOPE)
-                headers["Authorization"] = "Bearer " + token_provider()
+                access_information = self.azure_identity_helper.get_token_provider(scopes=self.__TOKEN_SCOPE)
+                headers["Authorization"] = "Bearer " + access_information()
 
             return requests.post(
                 url=urljoin(self.host, path),

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/azure_identity_helper.py

@@ -47,13 +47,21 @@ class AzureIdentityHelper:
             logger.info("Retrieving ChainedTokenCredential.")
         return self._credential
     
-    def get_token_provider(self, url):
+    def get_token(self, scopes):
         """
         Returns the configured ChainedTokenCredential.
         """
         with tracer.start_as_current_span("AzureIdentityHelper.get_token_provider"):
             logger.info("Retrieving ChainedTokenCredential provider.")
-        return get_bearer_token_provider(self._credential, url=url)
+        return self._credential.get_token(scopes=scopes)
+    
+    def get_token_provider(self, scopes):
+        """
+        Returns the configured ChainedTokenCredential.
+        """
+        with tracer.start_as_current_span("AzureIdentityHelper.get_token_provider"):
+            logger.info("Retrieving ChainedTokenCredential provider.")
+        return get_bearer_token_provider(self._credential, scopes=scopes)
     
 
 # Example usage (optional, for testing or demonstration):

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py

@@ -25,14 +25,11 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = self.azure_identity_helper.get_credential()
-            access_token = credential.get_token(
-                "https://ossrdbms-aad.database.windows.net/.default"
-            )
-
+            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+            token = access_information.token
             # Use the token in the connection string
             conn_string = (
-                f"host={host} user={user} dbname={dbname} password={access_token.token}"
+                f"host={host} user={user} dbname={dbname} password={token}"
             )
             keepalive_kwargs = {
                 "keepalives": 1,

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py

@@ -27,14 +27,11 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = self.azure_identity_helper.get_credential()
-            access_token = credential.get_token(
-                "https://ossrdbms-aad.database.windows.net/.default"
-            )
-
+            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+            token = access_information.token
             # Use the token in the connection string
             conn_string = (
-                f"host={host} user={user} dbname={dbname} password={access_token.token}"
+                f"host={host} user={user} dbname={dbname} password={token}"
             )
             keepalive_kwargs = {
                 "keepalives": 1,

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/env_helper.py

@@ -36,7 +36,7 @@ class EnvHelper:
         # load_dotenv()
 
         logger.info("Initializing EnvHelper")
-
+        
         # Wrapper for Azure Key Vault
         os.environ["APPLICATIONINSIGHTS_ENABLED"] = "true"
 
@@ -73,8 +73,9 @@ class EnvHelper:
             f"psql-main-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}"
         )
         self.AZURE_AUTH_TYPE = "rbac"
-        self.AZURE_TOKEN_PROVIDER = AzureIdentityHelper.get_token_provider(url="https://cognitiveservices.azure.com/.default"
-        )
+        azure_identity_helper = AzureIdentityHelper()# Extract context from the incoming request
+        access_information = azure_identity_helper.get_token_provider(scopes="https://cognitiveservices.azure.com/.default")
+        self.AZURE_TOKEN_PROVIDER = access_information
         self.AZURE_BLOB_ACCOUNT_NAME = (
             f"stqueue{self.PROJECT_CODE}{self.AZURE_RESOURCE_ENVIRONMENT}"
         )

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/helpers/lightrag_helper.py

@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__ + ".base_package")
 class LightRAGHelper:
     def __init__(self, env_helper):
         self.env_helper = env_helper
-        azure_identity_helper = AzureIdentityHelper()
+        self.azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
     def _create_connection(self):
@@ -21,14 +21,11 @@ class LightRAGHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = self.azure_identity_helper.get_credential()
-            access_token = credential.get_token(
-                "https://ossrdbms-aad.database.windows.net/.default"
-            )
-
+            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+            token = access_information.token    
             # Use the token in the connection string
             conn_string = (
-                f"host={host} user={user} dbname={dbname} password={access_token.token}"
+                f"host={host} user={user} dbname={dbname} password={token}"
             )
             keepalive_kwargs = {
                 "keepalives": 1,

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules/batch/utilities/tools/question_answer_tool.py

@@ -325,7 +325,11 @@ class QuestionAnswerTool(AnsweringToolBase):
             logger.debug(f"Answer format_answer_from_response: {answer}")
 
             # Append document citations to the answer
-            citations = "".join([f"[doc{i+1}]" for i in range(len(source_documents))])
+            citations = "".join([
+                f"[doc{i+1}]"
+                for i in range(len(source_documents))
+                if f"[doc{i+1}]" not in answer
+            ])
             answer_with_citations = f"{answer} {citations}"
             # Generate Answer Object
             clean_answer = Answer(

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/cwyodmodules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.24
+Version: 0.3.26
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent

{cwyodmodules-0.3.24 → cwyodmodules-0.3.26}/pyproject.toml

@@ -3,7 +3,7 @@ name = "cwyodmodules"
 authors = [
   { name="Patrik", email="patrikhartl@gmail.com" },
 ]
-version = '0.3.24'
+version = '0.3.26'
 description = "Add your description here"
 readme = "README.md"
 requires-python = "==3.11.11"