pygeai 0.2.7b38__py3-none-any.whl → 0.2.7b39__py3-none-any.whl

pygeai/core/files/managers.py

@@ -1,4 +1,5 @@
 from pygeai import logger
+from pygeai.admin.clients import AdminClient
 from pygeai.core.base.mappers import ErrorMapper, ResponseMapper
 from pygeai.core.base.responses import EmptyResponse
 from pygeai.core.files.clients import FileClient
@@ -28,8 +29,26 @@ class FileManager:
             base_url,
             alias
         )
-        self.__organization_id = organization_id
-        self.__project_id = project_id
+        self.organization_id = self.__get_organization_id() if not organization_id else organization_id
+        self.project_id = self.__get_project_id() if not project_id else project_id
+
+    def __get_organization_id(self):
+        response = None
+        try:
+            response = AdminClient().validate_api_token()
+            return response.get("organizationId")
+        except Exception as e:
+            logger.error(f"Error retrieving organization_id from GEAI. Response: {response}: {e}")
+            raise APIError(f"Error retrieving organization_id from GEAI: {e}")
+
+    def __get_project_id(self):
+        response = None
+        try:
+            response = AdminClient().validate_api_token()
+            return response.get("projectId")
+        except Exception as e:
+            logger.error(f"Error retrieving project_id from GEAI. Response: {response}: {e}")
+            raise APIError(f"Error retrieving project_id from GEAI: {e}")
 
     def upload_file(
             self,
@@ -47,8 +66,8 @@ class FileManager:
         """
         response_data = self.__client.upload_file(
             file_path=file.path,
-            organization_id=self.__organization_id,
-            project_id=self.__project_id,
+            organization_id=self.organization_id,
+            project_id=self.project_id,
             folder=file.folder,
             file_name=file.name,
         )
@@ -75,8 +94,8 @@ class FileManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__client.get_file(
-            organization=self.__organization_id,
-            project=self.__project_id,
+            organization=self.organization_id,
+            project=self.project_id,
             file_id=file_id
         )
         if ErrorHandler.has_errors(response_data):
@@ -101,8 +120,8 @@ class FileManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__client.delete_file(
-            organization=self.__organization_id,
-            project=self.__project_id,
+            organization=self.organization_id,
+            project=self.project_id,
             file_id=file_id
         )
         if ErrorHandler.has_errors(response_data):
@@ -128,8 +147,8 @@ class FileManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__client.get_file_content(
-            organization=self.__organization_id,
-            project=self.__project_id,
+            organization=self.organization_id,
+            project=self.project_id,
             file_id=file_id
         )
         if isinstance(response_data, dict) and "errors" in response_data:
@@ -151,8 +170,8 @@ class FileManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__client.get_file_list(
-            organization=self.__organization_id,
-            project=self.__project_id
+            organization=self.organization_id,
+            project=self.project_id
         )
         if ErrorHandler.has_errors(response_data):
             error = ErrorHandler.extract_error(response_data)

pygeai/tests/snippets/files/delete_file.py

@@ -1,12 +1,9 @@
-from pygeai.core.models import Organization, Project
 from pygeai.core.files.managers import FileManager
 from pygeai.core.files.models import File
 
-organization = Organization(id="4aa15b61-d3c7-4a5c-99b8-052d18a04ff2")
-project = Project(id="1956c032-3c66-4435-acb8-6a06e52f819f")
 file = File(id="7fe2393d-8f86-4020-a51f-bc14ab957e1e")
 
-file_manager = FileManager(organization_id=organization.id, project_id=project.id)
+file_manager = FileManager()
 
 response = file_manager.delete_file(file_id=file.id)
 print(response)

pygeai/tests/snippets/files/get_file_content.py

@@ -1,12 +1,10 @@
-from pygeai.core.models import Organization, Project
 from pygeai.core.files.managers import FileManager
 from pygeai.core.files.models import File
 
-organization = Organization(id="4aa15b61-d3c7-4a5c-99b8-052d18a04ff2")
-project = Project(id="1956c032-3c66-4435-acb8-6a06e52f819f")
+
 file = File(id="7fe2393d-8f86-4020-a51f-bc14ab957e1e")
 
-file_manager = FileManager(organization_id=organization.id, project_id=project.id)
+file_manager = FileManager()
 
 response = file_manager.get_file_content(file_id=file.id)
 print(response)

pygeai/tests/snippets/files/get_file_data.py

@@ -1,12 +1,9 @@
-from pygeai.core.models import Organization, Project
 from pygeai.core.files.managers import FileManager
 from pygeai.core.files.models import File
 
-organization = Organization(id="4aa15b61-d3c7-4a5c-99b8-052d18a04ff2")
-project = Project(id="1956c032-3c66-4435-acb8-6a06e52f819f")
 file = File(id="9984b837-fe88-4014-ad14-91e1596c8ead")
 
-file_manager = FileManager(organization_id=organization.id, project_id=project.id)
+file_manager = FileManager()
 
 response = file_manager.get_file_data(file_id=file.id)
 print(response)

pygeai/tests/snippets/files/get_file_list.py

@@ -1,11 +1,6 @@
-from pygeai.core.models import Organization, Project
 from pygeai.core.files.managers import FileManager
 
-organization = Organization(id="4aa15b61-d3c7-4a5c-99b8-052d18a04ff2")
-project = Project(id="1956c032-3c66-4435-acb8-6a06e52f819f")
-
-
-file_manager = FileManager(organization_id=organization.id, project_id=project.id)
+file_manager = FileManager()
 
 response = file_manager.get_file_list()
 print(response)

pygeai/tests/snippets/files/upload_file.py

@@ -1,17 +1,13 @@
-from pygeai.core.models import Organization, Project
 from pygeai.core.files.managers import FileManager
 from pygeai.core.files.models import UploadFile
 
-organization = Organization(id="4aa15b61-d3c7-4a5c-99b8-052d18a04ff2")
-project = Project(id="1956c032-3c66-4435-acb8-6a06e52f819f")
-
 file = UploadFile(
     path="test.txt",
     name="TestyFile",
     folder="TestyTestTemp"
 )
 
-file_manager = FileManager(organization_id=organization.id, project_id=project.id)
+file_manager = FileManager()
 
 response = file_manager.upload_file(file)
 print(response)

{pygeai-0.2.7b38.dist-info → pygeai-0.2.7b39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygeai
-Version: 0.2.7b38
+Version: 0.2.7b39
 Summary: Software Development Kit to interact with Globant Enterprise AI.
 Author-email: Globant <geai-sdk@globant.com>
 License-Expression: MIT

{pygeai-0.2.7b38.dist-info → pygeai-0.2.7b39.dist-info}/RECORD

@@ -91,7 +91,7 @@ pygeai/core/feedback/models.py,sha256=VdeVVWTQ8qc4TEPbL2XbYI4-UP2m2eh1pkBptw_do1
 pygeai/core/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pygeai/core/files/clients.py,sha256=gjmm5H_BOEK_QRNb55s4CBGMA_IRV-xvkwf9YCjdEAY,6564
 pygeai/core/files/endpoints.py,sha256=hAUC28hYVcHyEyEfoLaLae76TpuVSLexPVjLJYjSWYQ,337
-pygeai/core/files/managers.py,sha256=rzkJr9pOJYV4_y_3SRhd7gAZ4n3ziH_4TLN9gwIs_EY,6269
+pygeai/core/files/managers.py,sha256=Hzq-XMEJnnNrh3pG5PViQqSt1WrbO-z5wHXsoGrSQxA,7158
 pygeai/core/files/mappers.py,sha256=8PXXsQJZEH45yLISn_xsOZmcRUEe_F6ELkUeR1lzc-M,1462
 pygeai/core/files/models.py,sha256=QOLV5kUrHOvhJXzkoFqNQX4qmVPLy6KKBk6u7oE5ttU,438
 pygeai/core/files/responses.py,sha256=fnNLK-stnXGnB9d38szWrZMu7JLTtXghAoRZnFTFJCE,356
@@ -343,11 +343,11 @@ pygeai/tests/snippets/embeddings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 pygeai/tests/snippets/embeddings/generate_embeddings.py,sha256=IyIlO6UDGMjT-E9uK91NdYsuWI4fCRGwqlaFr0iUzSc,785
 pygeai/tests/snippets/evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pygeai/tests/snippets/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygeai/tests/snippets/files/delete_file.py,sha256=7GvC_aKPUExTt7-AApe9LnTRxo3CriWYn6vLZlk4Q24,488
-pygeai/tests/snippets/files/get_file_content.py,sha256=o1o81A3_3UrHFjBtNUyVYUJgPmRKgmylR5tfNWEhRpU,493
-pygeai/tests/snippets/files/get_file_data.py,sha256=Tnki6VpnRAMXAFQEEsRYXTqWhT2AfH-Gpyu3c5rXG00,490
-pygeai/tests/snippets/files/get_file_list.py,sha256=nlPsdEFTAYtIMx7N4CnrWhkkzt-vdzGw4ZmfxkU2ITY,379
-pygeai/tests/snippets/files/upload_file.py,sha256=SOgnkFg6FRsBfQSspHdx7oRgcth2b7-H05krs9Sb8H4,520
+pygeai/tests/snippets/files/delete_file.py,sha256=ORpPkrL9FllDonCHfoqf6LJUGyPHBoTdm1zpopzqbqU,249
+pygeai/tests/snippets/files/get_file_content.py,sha256=LM8DEmtE4MebEptcR_SUrbMfKuR9zfKfxsY9JspLVvc,255
+pygeai/tests/snippets/files/get_file_data.py,sha256=DGxbH155IcquE0t2uOifJRI6o5JQ8-DT5zQJ9MubIG4,251
+pygeai/tests/snippets/files/get_file_list.py,sha256=NItZBEqzHsS8HQEpAI2yoI5URhZB0F5eAys5Okbled8,138
+pygeai/tests/snippets/files/upload_file.py,sha256=In6XIvIFSbctrqOD8r_WMmGlXYGju4syNrBAZULjFow,280
 pygeai/tests/snippets/gam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pygeai/tests/snippets/gam/gam_access_token.py,sha256=168cZwF3IcAZ3neCdvh1jRxi1acpIDXHuyBZnuWwHQY,3122
 pygeai/tests/snippets/lab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -475,9 +475,9 @@ pygeai/vendor/a2a/utils/helpers.py,sha256=6Tbd8SVfXvdNEk6WYmLOjrAxkzFf1aIg8dkFfB
 pygeai/vendor/a2a/utils/message.py,sha256=gc_EKO69CJ4HkR76IFgsy-kENJz1dn7CfSgWJWvt-gs,2197
 pygeai/vendor/a2a/utils/task.py,sha256=BYRA_L1HpoUGJAVlyHML0lCM9Awhf2Ovjj7oPFXKbh0,1647
 pygeai/vendor/a2a/utils/telemetry.py,sha256=VvSp1Ztqaobkmq9-3sNhhPEilJS32-JTSfKzegkj6FU,10861
-pygeai-0.2.7b38.dist-info/licenses/LICENSE,sha256=eHfqo7-AWS8cMq0cg03lq7owsLeCmZA-xS5L0kuHnl8,1474
-pygeai-0.2.7b38.dist-info/METADATA,sha256=rl5fe-KL2smKocKPp1mlDZhHGTUhwRnbj9XX17fJjG8,6883
-pygeai-0.2.7b38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pygeai-0.2.7b38.dist-info/entry_points.txt,sha256=OAmwuXVCQBTCE3HeVegVd37hbhCcp9TPahvdrCuMYWw,178
-pygeai-0.2.7b38.dist-info/top_level.txt,sha256=bJFwp2tURmCfB94yXDF7ylvdSJXFDDJsyUOb-7PJgwc,7
-pygeai-0.2.7b38.dist-info/RECORD,,
+pygeai-0.2.7b39.dist-info/licenses/LICENSE,sha256=eHfqo7-AWS8cMq0cg03lq7owsLeCmZA-xS5L0kuHnl8,1474
+pygeai-0.2.7b39.dist-info/METADATA,sha256=Rs88NXHwjCB6i5OIyNq7FChpuoFUxR3TFIdn3X8DNEY,6883
+pygeai-0.2.7b39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pygeai-0.2.7b39.dist-info/entry_points.txt,sha256=OAmwuXVCQBTCE3HeVegVd37hbhCcp9TPahvdrCuMYWw,178
+pygeai-0.2.7b39.dist-info/top_level.txt,sha256=bJFwp2tURmCfB94yXDF7ylvdSJXFDDJsyUOb-7PJgwc,7
+pygeai-0.2.7b39.dist-info/RECORD,,