trainml 0.5.14__py3-none-any.whl → 0.5.15__py3-none-any.whl

tests/integration/cloudbender/conftest.py

@@ -0,0 +1,28 @@
+
+from pytest import fixture, mark
+
+
+pytestmark = [mark.integration,mark.cloudbender]
+
+@fixture(scope="session")
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+async def provider( trainml):
+    provider = await trainml.cloudbender.providers.enable(type="test")
+    await provider.wait_for("ready")
+    yield provider
+    await provider.remove()
+
+@fixture(scope="session")
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+async def region(trainml, provider):
+    region = await trainml.cloudbender.regions.create(provider_uuid=provider.id,name="test-region",
+        public=False,
+        storage=dict(mode="local"),)
+    await region.wait_for("healthy")
+    yield region
+    await region.remove()
+    await region.wait_for("archived")

tests/integration/cloudbender/test_providers_integration.py

@@ -8,14 +8,9 @@ pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.providers]
 
 @mark.create
 @mark.asyncio
-class GetProvidersTests:
-    @fixture(scope="class")
-    async def provider(self, trainml):
-        provider = await trainml.cloudbender.providers.enable(type="test")
-        yield provider
-        await provider.remove()
-
-    async def test_get_providers(self, trainml):
+@mark.xdist_group("cloudbender_resources")
+class GetProviderTests:
+    async def test_get_providers(self, trainml, provider):
         providers = await trainml.cloudbender.providers.list()
         assert len(providers) > 0
 

tests/integration/cloudbender/test_regions_integration.py

@@ -0,0 +1,42 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.regions]
+
+
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+class GetRegionTests:
+    async def test_get_regions(self, trainml, provider, region):
+        regions = await trainml.cloudbender.regions.list(provider_uuid=provider.id)
+        assert len(regions) > 0
+
+    async def test_get_region(self, trainml, provider, region):
+        response = await trainml.cloudbender.regions.get(provider.id, region.id)
+        assert response.id == region.id
+
+    async def test_region_properties(self, provider, region):
+        assert isinstance(region.id, str)
+        assert isinstance(region.provider_uuid, str)
+        assert isinstance(region.type, str)
+        assert region.type == "test"
+        assert region.provider_uuid == provider.id
+
+    async def test_region_str(self, region):
+        string = str(region)
+        regex = r"^{.*\"region_uuid\": \"" + region.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_region_repr(self, region):
+        string = repr(region)
+        regex = (
+            r"^Region\( trainml , \*\*{.*'region_uuid': '"
+            + region.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)

tests/integration/cloudbender/test_services_integration.py

@@ -0,0 +1,87 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+from cryptography import x509
+from cryptography.x509.oid import NameOID, ExtendedKeyUsageOID
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization, hashes
+
+pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.regions]
+
+def get_csr(service_id):
+    private_key = rsa.generate_private_key(
+        public_exponent=65537,
+        key_size=4096
+    )
+    csr = x509.CertificateSigningRequestBuilder().subject_name(x509.Name([
+        x509.NameAttribute(NameOID.COUNTRY_NAME, "US"),
+        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "proxiML"),
+        x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, service_id),
+        x509.NameAttribute(NameOID.COMMON_NAME, "test-client"),  # Client identity
+    ])).add_extension(
+        x509.ExtendedKeyUsage([
+            ExtendedKeyUsageOID.CLIENT_AUTH  # Client authentication usage
+        ]),
+        critical=True
+    ).sign(private_key, hashes.SHA256())
+    return csr.public_bytes(serialization.Encoding.PEM).decode("utf-8")
+
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+class GetServiceTests:
+    @fixture(scope="class")
+    async def service(self, trainml, region):
+        service = await trainml.cloudbender.services.create(
+            provider_uuid=region.provider_uuid,
+            region_uuid=region.id,
+            name="CLI Automated Service",
+            type="tcp",
+            port="8989",
+            public=False,
+        )
+        await service.wait_for("active")
+        yield service
+        await service.remove()
+        await service.wait_for("archived")
+
+    async def test_get_services(self, trainml, region,service):
+        services = await trainml.cloudbender.services.list(provider_uuid=region.provider_uuid, region_uuid=region.id)
+        assert len(services) > 0
+
+    async def test_get_service(self, trainml, provider, region, service):
+        response = await trainml.cloudbender.services.get(provider.id, region.id, service.id)
+        assert response.id == service.id
+
+    async def test_service_properties(self, region, service):
+        assert isinstance(service.id, str)
+        assert isinstance(service.provider_uuid, str)
+        assert isinstance(service.region_uuid, str)
+        assert isinstance(service.public, bool)
+        assert service.port == "8989"
+        assert service.provider_uuid == region.provider_uuid
+        assert service.region_uuid == region.id
+
+    async def test_service_str(self, service):
+        string = str(service)
+        regex = r"^{.*\"service_id\": \"" + service.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_service_repr(self, service):
+        string = repr(service)
+        regex = (
+            r"^Service\( trainml , \*\*{.*'service_id': '"
+            + service.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_service_certificate(self, service):
+        service = await service.generate_certificate()
+        assert isinstance(service._service.get("auth_cert"), str)
+        csr = get_csr(service.id)
+        certificate = await service.sign_client_certificate(csr)
+        assert isinstance(certificate, str)

tests/integration/conftest.py

@@ -40,7 +40,7 @@ def env(request):
     yield ENVS[env]
 
 
-@fixture(scope="module")
+@fixture(scope="session")
 def trainml(env):
     trainml = TrainML(**env)
     yield trainml

tests/integration/projects/conftest.py

@@ -1,7 +1,8 @@
-from pytest import fixture
+from pytest import fixture, mark
 
 
 @fixture(scope="module")
+@mark.xdist_group("project_resources")
 async def project(trainml):
     project = await trainml.projects.create(
         name="New Project", copy_credentials=False, copy_secrets=False

tests/integration/projects/test_projects_credentials_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectCredentialsTests:
     @fixture(scope="class")
     async def project_credential(self, project):

tests/integration/projects/test_projects_data_connectors_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectDataConnectorsTests:
     @fixture(scope="class")
     async def project_data_connector(self, project):

tests/integration/projects/test_projects_datastores_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectDatastoresTests:
     @fixture(scope="class")
     async def project_datastore(self, project):

tests/integration/projects/test_projects_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class GetProjectsTests:
     async def test_get_projects(self, trainml):
         projects = await trainml.projects.list()

tests/integration/projects/test_projects_members_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectMembersTests:
     @fixture(scope="class")
     async def project_member(self, project):

tests/integration/projects/test_projects_secrets_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectSecretsTests:
     @fixture(scope="class")
     async def project_secret(self, project):

tests/integration/projects/test_projects_services_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectServicesTests:
     @fixture(scope="class")
     async def project_service(self, project):

tests/integration/test_checkpoints_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.checkpoints]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("checkpoints")
 class GetCheckpointTests:
     @fixture(scope="class")
     async def checkpoint(self, trainml):

tests/integration/test_datasets_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.datasets]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("datasets")
 class GetDatasetTests:
     @fixture(scope="class")
     async def dataset(self, trainml):

tests/integration/test_jobs_integration.py

@@ -20,6 +20,7 @@ def extract_domain_suffix(hostname):
 
 
 @fixture(scope="class")
+@mark.xdist_group("job_lifecycle")
 async def job(trainml):
     job = await trainml.jobs.create(
         name="CLI Automated Tests - Job Lifecycle",
@@ -38,6 +39,7 @@ async def job(trainml):
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_lifecycle")
 class JobLifeCycleTests:
     async def test_wait_for_running(self, job):
         assert job.status != "running"
@@ -413,6 +415,7 @@ class JobAPIWorkerValidationTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_io")
 class JobIOTests:
     async def test_job_local_output(self, trainml, capsys):
         temp_dir = tempfile.TemporaryDirectory()
@@ -527,6 +530,7 @@ class JobIOTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_types")
 class JobTypeTests:
     async def test_endpoint(self, trainml):
 
@@ -648,6 +652,7 @@ class JobTypeTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_features")
 class JobFeatureTests:
     async def test_cpu_instance(self, trainml, capsys):
         job = await trainml.jobs.create(

tests/integration/test_models_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.models]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("models")
 class GetModelTests:
     @fixture(scope="class")
     async def model(self, trainml):

tests/integration/test_volumes_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.volumes]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("volumes")
 class GetVolumeTests:
     @fixture(scope="class")
     async def volume(self, trainml):

trainml/__init__.py

@@ -13,5 +13,5 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-__version__ = "0.5.14"
+__version__ = "0.5.15"
 __all__ = "TrainML"

trainml/cloudbender/services.py

@@ -67,7 +67,7 @@ class Services(object):
 
 
 class Service:
-    def __init__(self, trainml, **kwargs):
+    def __init__(self, trainml,  **kwargs):
         self.trainml = trainml
         self._service = kwargs
         self._id = self._service.get("service_id")
@@ -177,3 +177,21 @@ class Service:
                 logging.debug(f"self: {self}, retry count {count}")
 
         raise TrainMLException(f"Timeout waiting for {status}")
+    
+    async def generate_certificate(self, **kwargs):
+        resp = await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate",
+            "POST",
+            kwargs
+        )
+        self.__init__(self.trainml, **resp)
+        return self
+    
+    async def sign_client_certificate(self, csr, **kwargs):
+        certificate = await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

trainml/projects/services.py

@@ -77,3 +77,20 @@ class ProjectService:
         await self.trainml._query(
             f"/project/{self._project_uuid}/services/{self._id}/disable", "PATCH"
         )
+
+    async def get_service_ca_certificate(self, **kwargs):
+        certificate = await self.trainml._query(
+            f"/project/{self._project_uuid}/services/{self._id}/certificate/ca",
+            "GET",
+            kwargs,
+        )
+        return certificate
+    
+    async def sign_client_certificate(self, csr, **kwargs):
+        certificate = await self.trainml._query(
+            f"/project/{self._project_uuid}/services/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

{trainml-0.5.14.dist-info → trainml-0.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainml
-Version: 0.5.14
+Version: 0.5.15
 Summary: trainML client SDK and command line utilities
 Home-page: https://github.com/trainML/trainml-cli
 Author: trainML

{trainml-0.5.14.dist-info → trainml-0.5.15.dist-info}/RECORD

@@ -3,26 +3,28 @@ examples/create_dataset_and_training_job.py,sha256=Ht6soyBZxt8qA9Fp6zAW2syGEdasv
 examples/local_storage.py,sha256=w8iAeqr5CLOCOkNrqGzEDtybjDGGY7SQUqeE0ibMUrM,1745
 examples/training_inference_pipeline.py,sha256=SNr4RFT9y69F9G9tMD8ONUbJmXRFrq1yxynq-FbfEf8,2334
 tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/conftest.py,sha256=VWWTfofsFcBOdSCXQxNYbMcDEEaErDi2wFFMn--LE4Y,1134
-tests/integration/test_checkpoints_integration.py,sha256=Giy5Z6WyselfXzskDGR7Z0ks2KK2U7WGQBDPfyqQ6dk,3206
-tests/integration/test_datasets_integration.py,sha256=zdHOevduuMUWvVxaHBslpmH8AdvPdqEJ95MdqCC5_rw,3499
+tests/integration/conftest.py,sha256=otgb7lZu62_5zAMAsPpr0U2j0h5lApPlDRCiu7ZfDr8,1135
+tests/integration/test_checkpoints_integration.py,sha256=RbOHZK-fjj2xvYo1XDa6H0war43Qe_1PbiNFndVY87o,3239
+tests/integration/test_datasets_integration.py,sha256=sV88UAMM0IyVVum3zvxfYFbqmR8W4skNWE7jQxbc9ms,3529
 tests/integration/test_environments_integration.py,sha256=0IckhJvQhd8j4Ouiu0hMq2b7iA1dbZpZYmknyfWjsFM,1403
 tests/integration/test_gpu_types_integration.py,sha256=V2OncokZWWVq_l5FSmKEDM4EsWrmpB-zKiVPt-we0aY,1256
-tests/integration/test_jobs_integration.py,sha256=MHjzm4B6KRcWVRzvjGqHWxzOjvxCcHJhtegk7R_P5ng,25100
-tests/integration/test_models_integration.py,sha256=u6KVnX-F00TqwiU-gEoZJP1oKfAblqnyRptOc9vNGJ4,2878
-tests/integration/test_volumes_integration.py,sha256=gOmZpwwFxqeOAVmfKWSTmuyshx8nb2zu_0xv1RUEepM,3270
+tests/integration/test_jobs_integration.py,sha256=_c33hYpub3VoWiFY-dAzTVyB66U3n5yvMxoRR-pskHg,25263
+tests/integration/test_models_integration.py,sha256=Kwh8MQ0hOaecclAPq07LBEtAxoZB3rx-yamq0WGtWEA,2906
+tests/integration/test_volumes_integration.py,sha256=W5DeuuKCBx3C89LRWc0jhAZjJEREuPiawTLUnqpPrjg,3299
 tests/integration/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/cloudbender/test_providers_integration.py,sha256=oV8ydFsosDZ_Z1Dkg2IN-ZhWuIl5e_HkHAORMsOsAJc,1473
+tests/integration/cloudbender/conftest.py,sha256=jBYUHKJioI-WHM-d0Y4lq5pD4LiOPINj6K9kQkgaGWY,777
+tests/integration/cloudbender/test_providers_integration.py,sha256=mQn2dr4oMpctCVCVs53G5P0Raa0U2uBxEYjZtFFSvTg,1327
+tests/integration/cloudbender/test_regions_integration.py,sha256=Ex1SB8xrl3KQ48n-Cka_1Whj8_uFsmhvJuOSdfK3kPk,1406
+tests/integration/cloudbender/test_services_integration.py,sha256=_cGxEtjTDwz4pne6s1gVyEwoRcYYKcJClNUP5Yalrz0,3367
 tests/integration/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/projects/conftest.py,sha256=sNN1Svq2IO63Yx3DC7-5ZnksaEifGpDZU-3ti9sZhIU,249
-tests/integration/projects/test_projects_credentials_integration.py,sha256=3PnpxNEsedXmyyhqjSb8T4JzupB1Kmwu--3stNTBlN8,1636
-tests/integration/projects/test_projects_data_connectors_integration.py,sha256=R90v7HVN4i9k-AOEl17AvnbWIwnD9Fl1OK9IGOV847o,1630
-tests/integration/projects/test_projects_datastores_integration.py,sha256=S9aSvryVjrcoEDezr33x4T5aPjEhUwL9O1-1eyzhQ-s,1469
-tests/integration/projects/test_projects_integration.py,sha256=HP4jPAyTqGt7pwk42bxQsqGp0olgai6sI-S1XXcXoJs,1241
-tests/integration/projects/test_projects_keys_integration.py,sha256=O-a9OwBxIM2l0vi__GMlWP8ncNswxGBJvEhgo8PoalQ,1423
-tests/integration/projects/test_projects_members_integration.py,sha256=7nnG9wS4a-OZpOI4C0k3SyeHCqZVP-XsYyHNN6I5hCo,1843
-tests/integration/projects/test_projects_secrets_integration.py,sha256=bagLLfSUP805gOOPbn_xCQyifflNzIs8DGUBeUwOhO0,1481
-tests/integration/projects/test_projects_services_integration.py,sha256=lBnrqFpjsL3zfaJJmFh2rCWfNmmX-TjyOPCR3KobDAc,1530
+tests/integration/projects/conftest.py,sha256=v4XqQEmNSmV_hNEjLEIOeGJxFoAl-km8UXO_5jO--6E,294
+tests/integration/projects/test_projects_credentials_integration.py,sha256=DYkd57hxu6wGFAyfgQGQbIR6Ja0501UCsSnjWzxBEkk,1675
+tests/integration/projects/test_projects_data_connectors_integration.py,sha256=0giPCNeMx-Mj6--i0LTEt3m_ZwElSQzhrbxmcpNOthc,1669
+tests/integration/projects/test_projects_datastores_integration.py,sha256=Eln5xPy6qp2JWai97U61fAQa4lGpmYlSTjbuzJl2jYc,1508
+tests/integration/projects/test_projects_integration.py,sha256=1tHXGeF05Bsr5osyMyf4VY8qf1a4xYLUaF7yRaoDoLE,1280
+tests/integration/projects/test_projects_members_integration.py,sha256=bEc9AqC-YZ0hifvVaDmcVGbK3aYuTBNGBj0g4rjBEiQ,1882
+tests/integration/projects/test_projects_secrets_integration.py,sha256=dnIT0KiHnXBVP-azfw8MCspTjX7q1ic03rz8XZNijvU,1520
+tests/integration/projects/test_projects_services_integration.py,sha256=3DpOtVMIdG_Icp4s7JxMT70ZDKC1wMD8imkKjlQChb0,1569
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/conftest.py,sha256=hLfECgT0w4pVZABrpK4UUUeaX1aDzQvj8-erWTGBjHA,35588
 tests/unit/test_auth_unit.py,sha256=nfhlOCR7rUsn_MaD8QQtBc2v0k8pIxqbzGgRAZK1WGc,858
@@ -56,7 +58,6 @@ tests/unit/cli/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 tests/unit/cli/projects/test_cli_project_credential_unit.py,sha256=gnmEpNbpEG5S9cYQUjSGty2e8mqeC_cCKmIUAJCgRXg,943
 tests/unit/cli/projects/test_cli_project_data_connector_unit.py,sha256=_NgnxV8zTIycpHKe7dyL6EXq774puFHQjvgCKsiEMO0,993
 tests/unit/cli/projects/test_cli_project_datastore_unit.py,sha256=E_kLoIZ5U92LQaPcYAKDyUqpjM1Xe6PVPvofU1Yn6Yk,936
-tests/unit/cli/projects/test_cli_project_key_unit.py,sha256=Ma5HjsZt2RaHKgmMdGY59EIc2WdAgbWKWn2LvlYeDqQ,894
 tests/unit/cli/projects/test_cli_project_secret_unit.py,sha256=QBkq1gVqkjGUni2xCihL994bvseNcA-dyUWaJVU9GjI,915
 tests/unit/cli/projects/test_cli_project_service_unit.py,sha256=TRNOwK3RUCtktYdCGzfhQE3fE_mn8LweCN5E4gRn1h4,922
 tests/unit/cli/projects/test_cli_project_unit.py,sha256=0IynsMwFsXBZn-u0gX2iir7AjPsNraHe68PuAe-Lkaw,627
@@ -73,12 +74,11 @@ tests/unit/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tests/unit/projects/test_project_credentials_unit.py,sha256=ObTaJ7_g0MP5N-0qHWdeYips0in1j_4UkOhXXI2FFwo,3480
 tests/unit/projects/test_project_data_connectors_unit.py,sha256=uQPFx6rwYMWZz1IJkns_LdM5gccyHSIaKb3k8zmfSkY,3385
 tests/unit/projects/test_project_datastores_unit.py,sha256=kcoaSs54gGqJ9gwPMpP6KHAPRvDJtdJpm49s4aYYt3E,3129
-tests/unit/projects/test_project_keys_unit.py,sha256=2-w_VwmWxWHoLWBCoBAfg5WozyeYJHV361ZndlA0xk4,3161
 tests/unit/projects/test_project_members_unit.py,sha256=C5N6jzT7zM3eL3_bXEddddBHPFJ3617T0lYluBjMy78,3466
 tests/unit/projects/test_project_secrets_unit.py,sha256=StVlY-ZR3CKxXAt9NL8hTkXUEdgGESH0m6foEPXKE-4,3276
 tests/unit/projects/test_project_services_unit.py,sha256=ZK5nz78RAmmaCrAwYBd34t87dh6etU-7snLB_xukZHM,3331
 tests/unit/projects/test_projects_unit.py,sha256=8rJ40bJ7YszEsoL6D02Muey-sgRjqFmMoR-R3IiP_Ig,3810
-trainml/__init__.py,sha256=vYYGXBmjJ4UtHA7qJ4sjTIRUHAaoVlBJUKLRiP0Sioc,433
+trainml/__init__.py,sha256=yxX-2bQsXFk3KgMV8b7day_Wz6qy6Ag4kOHvcMCv15k,433
 trainml/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 trainml/auth.py,sha256=clbx5S5prJ3u62aEESdBXIHF_HmreQ-L1ShxcyWQNDs,26565
 trainml/checkpoints.py,sha256=Hg3_Si7ohzsv4_8JIjoj9pMRpHNZRWKC5R2gtgmp01s,8790
@@ -113,7 +113,6 @@ trainml/cli/project/__init__.py,sha256=HDcJUbKMHhz4Thrvpst5hnywFqzsv0XWmvfKNRi8z
 trainml/cli/project/credential.py,sha256=gByXKiYf5sJeNRtuXWcercWv8P2IzO5TjT8Ypp4mCR8,3443
 trainml/cli/project/data_connector.py,sha256=KLDhpNJfwcJkcmyuJRgcVH70Jf73619O9ddYP8vhMvk,1411
 trainml/cli/project/datastore.py,sha256=IwF0LqsSFn7DrKPRdxQs6kturk9MCI52A1aoWeb7ClA,1336
-trainml/cli/project/key.py,sha256=kQlCs_N-5c27hOyGkmT22_J47x8U6CZaSardsaPYGbw,3203
 trainml/cli/project/secret.py,sha256=tHt7bYDt0MNkLTTePTIJFUh9Mn9ogebPcaSCiNRJFNQ,1927
 trainml/cli/project/service.py,sha256=FzcyGI9MN-UvnjdKW7GmXLTXLUIXtuTFAISR_FmCmJo,1310
 trainml/cloudbender/__init__.py,sha256=iE29obtC0_9f0IhRvHQcG5aY58fVhVYipTakpjAhdss,64
@@ -125,19 +124,18 @@ trainml/cloudbender/devices.py,sha256=QORNmKdLJoqGZmeWXRnivC1JmNBIw-ebvf4bsoem3r
 trainml/cloudbender/nodes.py,sha256=U2sTIL2fuBVsNFPsJrvB2JbBcuLULF1-AwJ4dp5ChmM,5924
 trainml/cloudbender/providers.py,sha256=22ymUl1KLC8UlyoWMsIrOKhUDOwnhklhHQ3EZ_V6eWA,3738
 trainml/cloudbender/regions.py,sha256=nfSY9fIWp_AaRE_1Y0qwXX6WVSyPKxpji-zUfM3BNUo,5157
-trainml/cloudbender/services.py,sha256=KC3VcyljvnazUUG-Tzwm6Ab6d0--yuccXjOaMgYB5uA,5126
+trainml/cloudbender/services.py,sha256=bJtp9ljq8g10r-04phV_XXS8mS8YR3KMbJ4XtHa2SOI,5773
 trainml/projects/__init__.py,sha256=6NKCcHtQMeGB1IyU-djANphfnDX6MEkrXUM5Fyq9fWg,75
 trainml/projects/credentials.py,sha256=6WqHy_-SZZwqE4rULLF8gSyeRVmfsUxqZBuCjBXyxKw,2255
 trainml/projects/data_connectors.py,sha256=WZATdUq4vE3x47Ny5HDwPD7lIUx0syjaSE9BmFWNuEg,2216
 trainml/projects/datastores.py,sha256=qocqD5mGfm2V_wh36CEh3oldnIeJg57ppc6CM129Dkk,2095
-trainml/projects/keys.py,sha256=qcQAdysTbfVW19tzzxZDvBBWjU9DG0dkViLmG_S0SyM,2157
 trainml/projects/members.py,sha256=7fptZ2leIQEUiRtvd3z15RTOJyPafzc5wwQLNxICElQ,2826
 trainml/projects/projects.py,sha256=5_6HUg9ZYq8v69QPgC4Yfd_DM0OlZd8tnxh2ahjOgm0,2890
 trainml/projects/secrets.py,sha256=TIvBd3rAvd4lF3pm5qR98UslHjldzlnzn_n9yvpmLgg,2160
-trainml/projects/services.py,sha256=W2IHgRUT9BemWThsY7uAot2gbmyPaH41WAii-NQ_cT8,2206
-trainml-0.5.14.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.14.dist-info/METADATA,sha256=nZzRcI63jvOZveDYFvGm4UEVLrPRCItQ6nUxTQ2Pw-Q,7346
-trainml-0.5.14.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.14.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.14.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.14.dist-info/RECORD,,
+trainml/projects/services.py,sha256=rI-uFmojqOTNLbqBeX6gaSwMkI6LKzRuJthQCH0A2h4,2771
+trainml-0.5.15.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
+trainml-0.5.15.dist-info/METADATA,sha256=kFbUgFw2pcOjJgySdhnKmVrkVpkFMI6mtVrN7t26yXA,7346
+trainml-0.5.15.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+trainml-0.5.15.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
+trainml-0.5.15.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
+trainml-0.5.15.dist-info/RECORD,,

tests/integration/projects/test_projects_keys_integration.py

@@ -1,43 +0,0 @@
-import re
-import sys
-import asyncio
-from pytest import mark, fixture
-
-pytestmark = [mark.sdk, mark.integration, mark.projects]
-
-
-@mark.create
-@mark.asyncio
-class ProjectKeysTests:
-    @fixture(scope="class")
-    async def project_key(self, project):
-        project_key = await project.keys.put(
-            type="aws", key_id="ASFHALKF", secret="IUHKLHKAHF"
-        )
-        yield project_key
-        await project.keys.remove(type="aws")
-
-    async def test_list_project_keys(self, project, project_key):
-        keys = await project.keys.list()
-        assert len(keys) > 0
-
-    async def test_project_key_properties(self, project, project_key):
-        assert isinstance(project_key.project_uuid, str)
-        assert isinstance(project_key.type, str)
-        assert isinstance(project_key.key_id, str)
-        assert project_key.type == "aws"
-        assert project.id == project_key.project_uuid
-
-    async def test_project_key_str(self, project_key):
-        string = str(project_key)
-        regex = r"^{.*\"type\": \"" + project_key.type + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    async def test_project_key_repr(self, project_key):
-        string = repr(project_key)
-        regex = (
-            r"^ProjectKey\( trainml , \*\*{.*'type': '" + project_key.type + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)

tests/unit/cli/projects/test_cli_project_key_unit.py

@@ -1,26 +0,0 @@
-import re
-import json
-import click
-from unittest.mock import AsyncMock, patch, create_autospec
-from pytest import mark, fixture, raises
-
-pytestmark = [mark.cli, mark.unit, mark.projects]
-
-from trainml.cli.project import key as specimen
-from trainml.projects import (
-    Project,
-)
-
-
-def test_list_keys(runner, mock_project_keys):
-    with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
-        project = create_autospec(Project)
-        mock_trainml.projects = AsyncMock()
-        mock_trainml.projects.get = AsyncMock(return_value=project)
-        mock_trainml.projects.get_current = AsyncMock(return_value=project)
-        project.keys = AsyncMock()
-        project.keys.list = AsyncMock(return_value=mock_project_keys)
-        result = runner.invoke(specimen, ["list"])
-        print(result)
-        assert result.exit_code == 0
-        project.keys.list.assert_called_once()

tests/unit/projects/test_project_keys_unit.py

@@ -1,96 +0,0 @@
-import re
-import json
-import logging
-from unittest.mock import AsyncMock, patch
-from pytest import mark, fixture, raises
-from aiohttp import WSMessage, WSMsgType
-
-import trainml.projects.keys as specimen
-from trainml.exceptions import (
-    ApiError,
-    SpecificationError,
-    TrainMLException,
-)
-
-pytestmark = [mark.sdk, mark.unit, mark.projects]
-
-
-@fixture
-def project_keys(mock_trainml):
-    yield specimen.ProjectKeys(mock_trainml, project_id="1")
-
-
-@fixture
-def project_key(mock_trainml):
-    yield specimen.ProjectKey(
-        mock_trainml, project_uuid="proj-id-1", type="aws", key_id="AIYHGFSDLK"
-    )
-
-
-class ProjectKeysTests:
-    @mark.asyncio
-    async def test_project_keys_list(self, project_keys, mock_trainml):
-        api_response = [
-            {"project_uuid": "proj-id-1", "type": "aws", "key_id": "AIYHGFSDLK"},
-            {"project_uuid": "proj-id-1", "type": "gcp", "key_id": "credentials.json"},
-        ]
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        resp = await project_keys.list()
-        mock_trainml._query.assert_called_once_with("/project/1/keys", "GET", dict())
-        assert len(resp) == 2
-
-    @mark.asyncio
-    async def test_remove_project_key(
-        self,
-        project_keys,
-        mock_trainml,
-    ):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await project_keys.remove("aws")
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/key/aws", "DELETE", dict()
-        )
-
-    @mark.asyncio
-    async def test_put_project_key(self, project_keys, mock_trainml):
-        requested_config = dict(type="aws", key_id="AIUDHADA", secret="ASKHJSLKF")
-        expected_payload = dict(key_id="AIUDHADA", secret="ASKHJSLKF")
-        api_response = {
-            "project_uuid": "project-id-1",
-            "type": "aws",
-            "key_id": "AIUDHADA",
-        }
-
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        response = await project_keys.put(**requested_config)
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/key/aws", "PUT", None, expected_payload
-        )
-        assert response.type == "aws"
-
-
-class ProjectKeyTests:
-    def test_project_key_properties(self, project_key):
-        assert isinstance(project_key.type, str)
-        assert isinstance(project_key.key_id, str)
-        assert isinstance(project_key.project_uuid, str)
-
-    def test_project_key_str(self, project_key):
-        string = str(project_key)
-        regex = r"^{.*\"type\": \"" + project_key.type + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_project_key_repr(self, project_key):
-        string = repr(project_key)
-        regex = (
-            r"^ProjectKey\( trainml , \*\*{.*'type': '" + project_key.type + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_project_key_bool(self, project_key, mock_trainml):
-        empty_project_key = specimen.ProjectKey(mock_trainml)
-        assert bool(project_key)
-        assert not bool(empty_project_key)

trainml/cli/project/key.py

@@ -1,124 +0,0 @@
-import click
-import os
-import json
-import base64
-from pathlib import Path
-from trainml.cli import pass_config
-from trainml.cli.project import project
-
-
-@project.group()
-@pass_config
-def key(config):
-    """trainML project key commands."""
-    pass
-
-
-@key.command()
-@pass_config
-def list(config):
-    """List keys."""
-    data = [
-        ["TYPE", "KEY ID", "UPDATED AT"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-    project = config.trainml.run(config.trainml.client.projects.get_current())
-    keys = config.trainml.run(project.keys.list())
-
-    for key in keys:
-        data.append(
-            [
-                key.type,
-                key.key_id,
-                key.updated_at.isoformat(timespec="seconds"),
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >13.11} {: >37.35} {: >28.26}" "".format(*row),
-            file=config.stdout,
-        )
-
-
-@key.command()
-@click.argument(
-    "type",
-    type=click.Choice(
-        [
-            "aws",
-            "azure",
-            "docker",
-            "gcp",
-            "huggingface",
-            "kaggle",
-            "ngc",
-            "wasabi",
-        ],
-        case_sensitive=False,
-    ),
-)
-@pass_config
-def put(config, type):
-    """
-    Set a key.
-
-    A key is uploaded.
-    """
-    project = config.trainml.run(config.trainml.client.projects.get_current())
-
-    tenant = None
-
-    if type in ["aws", "wasabi"]:
-        key_id = click.prompt("Enter the key ID", type=str, hide_input=False)
-        secret = click.prompt("Enter the secret key", type=str, hide_input=True)
-    elif type == "azure":
-        key_id = click.prompt(
-            "Enter the Application (client) ID", type=str, hide_input=False
-        )
-        tenant = click.prompt(
-            "Enter the Directory (tenant) ley", type=str, hide_input=False
-        )
-        secret = click.prompt("Enter the client secret", type=str, hide_input=True)
-    elif type in ["docker", "huggingface"]:
-        key_id = click.prompt("Enter the username", type=str, hide_input=False)
-        secret = click.prompt("Enter the access token", type=str, hide_input=True)
-    elif type in ["gcp", "kaggle"]:
-        file_name = click.prompt(
-            "Enter the path of the credentials file",
-            type=click.Path(
-                exists=True, file_okay=True, dir_okay=False, resolve_path=True
-            ),
-            hide_input=False,
-        )
-        key_id = os.path.basename(file_name)
-        with open(file_name) as f:
-            secret = json.load(f)
-        secret = json.dumps(secret)
-    elif type == "ngc":
-        key_id = "$oauthtoken"
-        secret = click.prompt("Enter the access token", type=str, hide_input=True)
-    else:
-        raise click.UsageError("Unsupported key type")
-
-    return config.trainml.run(
-        project.keys.put(type=type, key_id=key_id, secret=secret, tenant=tenant)
-    )
-
-
-@key.command()
-@click.argument("name", type=click.STRING)
-@pass_config
-def remove(config, name):
-    """
-    Remove a key.
-
-
-    """
-    project = config.trainml.run(config.trainml.client.projects.get_current())
-
-    return config.trainml.run(project.key.remove(name))

trainml/projects/keys.py

@@ -1,71 +0,0 @@
-import json
-import logging
-from datetime import datetime
-from dateutil import parser, tz
-
-
-class ProjectKeys(object):
-    def __init__(self, trainml, project_id):
-        self.trainml = trainml
-        self.project_id = project_id
-
-    async def list(self, **kwargs):
-        resp = await self.trainml._query(
-            f"/project/{self.project_id}/keys", "GET", kwargs
-        )
-        keys = [ProjectKey(self.trainml, **service) for service in resp]
-        return keys
-
-    async def put(self, type, key_id, secret, tenant=None, **kwargs):
-        data = dict(key_id=key_id, secret=secret, tenant=tenant)
-        payload = {k: v for k, v in data.items() if v is not None}
-        logging.info(f"Creating Project Key {type}")
-        resp = await self.trainml._query(
-            f"/project/{self.project_id}/key/{type}", "PUT", None, payload
-        )
-        key = ProjectKey(self.trainml, **resp)
-        logging.info(f"Created Project Key {type} in project {self.project_id}")
-
-        return key
-
-    async def remove(self, type, **kwargs):
-        await self.trainml._query(
-            f"/project/{self.project_id}/key/{type}", "DELETE", kwargs
-        )
-
-
-class ProjectKey:
-    def __init__(self, trainml, **kwargs):
-        self.trainml = trainml
-        self._entity = kwargs
-        self._type = self._entity.get("type")
-        self._project_uuid = self._entity.get("project_uuid")
-        self._key_id = self._entity.get("key_id")
-        self._updated_at = self._entity.get("updatedAt")
-
-    @property
-    def type(self) -> str:
-        return self._type
-
-    @property
-    def project_uuid(self) -> str:
-        return self._project_uuid
-
-    @property
-    def key_id(self) -> str:
-        return self._key_id
-
-    @property
-    def updated_at(self) -> datetime:
-        timestamp = parser.isoparse(self._updated_at)
-        timezone = tz.tzlocal()
-        return timestamp.astimezone(timezone)
-
-    def __str__(self):
-        return json.dumps({k: v for k, v in self._entity.items()})
-
-    def __repr__(self):
-        return f"ProjectKey( trainml , **{self._entity.__repr__()})"
-
-    def __bool__(self):
-        return bool(self._type)