cwyodmodules 0.3.24__py3-none-any.whl → 0.3.26__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → cwyodmodules-0.3.26.dist-info}/METADATA

@@ -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.dist-info → cwyodmodules-0.3.26.dist-info}/RECORD

@@ -6,7 +6,7 @@ cwyodmodules/batch/utilities/chat_history/auth_utils.py,sha256=TBSg7-ypKNnCPsmWp
 cwyodmodules/batch/utilities/chat_history/cosmosdb.py,sha256=oiL_iM6yUoxadP7Cx0ewiVAfS2ubdouuI6gllva4-Is,7374
 cwyodmodules/batch/utilities/chat_history/database_client_base.py,sha256=6y7h2iL0Uxn4c11N99Ao-8nplQGVGQAOnev3GlHIDXA,2328
 cwyodmodules/batch/utilities/chat_history/database_factory.py,sha256=kdleC4P8u8rYPsx2HcPQwyOgFf_mph3Nh-Mmzz1V7oM,2401
-cwyodmodules/batch/utilities/chat_history/postgresdbservice.py,sha256=ktAb0d2fPQLA5N_ti-KE7o96MkjN0hEyWHDDd7KBH90,14081
+cwyodmodules/batch/utilities/chat_history/postgresdbservice.py,sha256=L1WTTHX9RfY_wWhu7vQXDBoZOfXfOtFqSrUjE0h0sYA,14047
 cwyodmodules/batch/utilities/chat_history/sample_user.py,sha256=GNXZ_yTjud8Zj0vgHnoU96RJMiJt0YRjEVO3pt7203A,3037
 cwyodmodules/batch/utilities/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cwyodmodules/batch/utilities/common/answer.py,sha256=C1g_Xt85TfXK2qV1F6J5_o3MyIUdFpUmvgkIpuEcp4I,3093
@@ -28,16 +28,16 @@ cwyodmodules/batch/utilities/document_loading/web.py,sha256=LRTNYs_7CN8nfMOaCoW7
 cwyodmodules/batch/utilities/document_loading/word_document.py,sha256=-F1asMaupQk4swEeCoAD8tyYENE4Qq-05-VmPUjRdeA,1569
 cwyodmodules/batch/utilities/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py,sha256=FN2XnEThmtbWnwSi1sEfgekuPH7aJBOAU5n2DBmQ9ww,10315
-cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py,sha256=JUv0qRlNi4OmBvNMNlrpeBXapgs3FU5WE8MmebGTs5k,3628
+cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py,sha256=Wq6Sx5k9XZm9xEWMOiNDzxd_Sh7-M4EPRra5QEf5yCs,3639
 cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py,sha256=wpY4Ih1GPCFgrL4MhznpZSYDFN20R5LV_xlegPt3Phs,6715
-cwyodmodules/batch/utilities/helpers/azure_identity_helper.py,sha256=0xX5x_iBCIThjYnb7PjU1W54fBaVwA6fYDh3CjQTS5Y,2482
-cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py,sha256=VVqP6koqavcOjdcBf1lPBlI_Mrt4i46bgICgPwpyE_A,10891
-cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=N2WVi77Z85q8Ft_LyOjsD-NytA0atLTFa961HHuQ9ro,10971
+cwyodmodules/batch/utilities/helpers/azure_identity_helper.py,sha256=mB7Xel5G2VD1bb1MVTiYcxmIl-h0980dpHT0fTPRHQk,2829
+cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py,sha256=WSIGBuIp0MNsI67h-t24T26LrX9QvGg4uijAY4YItPg,10852
+cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=Ui5diqo-okPiH416A1EyPg1zZLRI1h986jQimcPi0ls,10932
 cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=U_o6NVtJKByhxbvMKnWtfw2lx43pHBtSsGpThJnrOPo,10425
 cwyodmodules/batch/utilities/helpers/document_chunking_helper.py,sha256=2MZOjW-fHXgYijP3m9O-nizOlk96Yg0axyxT0K6fTnM,725
 cwyodmodules/batch/utilities/helpers/document_loading_helper.py,sha256=2HBEl3vW-_PKbX5pPntTC_R5eToTk2Qb-q3M4Mt6hCU,603
-cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=Ku_4j6DuKXDgnFul4zrZr_C5iESbmlEPwKWyIkb6aII,15744
-cwyodmodules/batch/utilities/helpers/lightrag_helper.py,sha256=GooV_V9uaBmWq89cak_bzSn6Hvjv2PxIQO3eW0Uryy8,3485
+cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=l0kRDKEzYcPyKm6USVRKDtk-NXHrr7hbq8CxWlPvfm0,15893
+cwyodmodules/batch/utilities/helpers/lightrag_helper.py,sha256=m5xlzDGzWGm-ZkpB88VzE-jXRdntBEyUv24mDpotc94,3455
 cwyodmodules/batch/utilities/helpers/llm_helper.py,sha256=icJy0ix4TimrJKRmYUnODJeh8wHYawAmeZ5QsamAiUg,7499
 cwyodmodules/batch/utilities/helpers/orchestrator_helper.py,sha256=mCcZyMFG0otnw9gzWd-PYocHmDdFDVg-RT9oDPiDZPk,897
 cwyodmodules/batch/utilities/helpers/secret_helper.py,sha256=HqzkK83ScREQYtOAoThTmyhTni6n6aQzeJQeVmcN13E,3098
@@ -86,7 +86,7 @@ cwyodmodules/batch/utilities/tools/answer_processing_base.py,sha256=N3Dz7HfN-zl0
 cwyodmodules/batch/utilities/tools/answering_tool_base.py,sha256=aN2ND5Ud_1ZlIPfhLRrOe_m4MUf_SaXvO6q7GcbGiU8,348
 cwyodmodules/batch/utilities/tools/content_safety_checker.py,sha256=UuSleGcgH1NzGLsQVU5dONgQSARt7jmhm2WATdHkHq8,4863
 cwyodmodules/batch/utilities/tools/post_prompt_tool.py,sha256=rhRU18IDfR0Bfu-gdkrRFwOXxNoKm2NY8NoikmjXYRI,2932
-cwyodmodules/batch/utilities/tools/question_answer_tool.py,sha256=A-yApCrI3RFvdmmP4RNJQY8qf8eSXE7V4-mbbWvV6mo,13055
+cwyodmodules/batch/utilities/tools/question_answer_tool.py,sha256=JF3XPTEk6FGebLFcBUhT1nNIt_MXGNZmwPYah4cG4Ak,13148
 cwyodmodules/batch/utilities/tools/text_processing_tool.py,sha256=KSKo8Gm6QgQ5TkoISE4eAfiGOyChN4tCV4Qy5eh0_wQ,1997
 cwyodmodules/graphrag/__init__.py,sha256=O5fi4Q3RC9Gt8ItNZGV1HjyIJvEz7grYXTFMmUWstxw,111
 cwyodmodules/graphrag/config.py,sha256=TvG45dezHkqgZzWnPxhpyWciIiKOrD_3JQ3APkoD6Hw,1525
@@ -108,8 +108,8 @@ cwyodmodules/graphrag/query/generate.py,sha256=xBnZs2U9xFWtPk4AfAZgYKbHdcxNcIO6Q
 cwyodmodules/graphrag/query/graph_search.py,sha256=95h3ecSWx4864XgKABtG0fh3Nk8HkqJVzoCrO8daJ-Y,7724
 cwyodmodules/graphrag/query/types.py,sha256=1Iq1dp4I4a56_cuFjOZ0NTgd0A2_MpVFznp_czgt6cI,617
 cwyodmodules/graphrag/query/vector_search.py,sha256=9Gwu9LPjtoAYUU8WKqCvbCHAIg3dpk71reoYd1scLnQ,1807
-cwyodmodules-0.3.24.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
-cwyodmodules-0.3.24.dist-info/METADATA,sha256=9g64P79MLzDT2cV5kLE0XeOqKAMh59ykcDEyZuxuFsU,1969
-cwyodmodules-0.3.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cwyodmodules-0.3.24.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
-cwyodmodules-0.3.24.dist-info/RECORD,,
+cwyodmodules-0.3.26.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
+cwyodmodules-0.3.26.dist-info/METADATA,sha256=osdJnBZgG-oLWInIbdYsBxswchDD7vU7-bayIz6PmzY,1969
+cwyodmodules-0.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cwyodmodules-0.3.26.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
+cwyodmodules-0.3.26.dist-info/RECORD,,