zipher-sdk 0.3.9__tar.gz → 0.4.2__tar.gz

{zipher-sdk-0.3.9/zipher_sdk.egg-info → zipher-sdk-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zipher-sdk
-Version: 0.3.9
+Version: 0.4.2
 Summary: Python SDK for programmatic access to the Zipher API
 Home-page: UNKNOWN
 Author: Zipher Inc.

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/setup.py

@@ -8,7 +8,7 @@ with open('README.md', encoding='utf-8') as f:
 
 setup(
     name='zipher-sdk',
-    version='0.3.9',
+    version='0.4.2',
     description='Python SDK for programmatic access to the Zipher API',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -16,7 +16,7 @@ setup(
     author_email='yoav@zipher.cloud',
     packages=find_packages(),
     install_requires=[
-        "pydantic>=2.7.3,<3.0.0",
+        "pydantic==2.11.3",
         "requests==2.32.3",
         "databricks-sdk==0.52.0"
     ],

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/tests/test_acl/test_acl.py

@@ -351,3 +351,66 @@ class TestACL(TestCase):
         cls.admin_dbx.dbfs.delete(path=f'dbfs:/{cls.dbfs_test_folder}', recursive=True)
         cls.admin_dbx.queries.delete(cls.query.id)
         cls.admin_dbx.warehouses.delete(cls.warehouse.id)
+
+
+class TestExistingServicePrincipal(TestCase):
+    """Separate test class for testing existing_service_principal_id without running expensive setUpClass."""
+    
+    @classmethod
+    def setUpClass(cls):
+        cls.host = os.environ['DATABRICKS_HOST_TEST']
+        cls.admin_dbx: WorkspaceClient = WorkspaceClient(host=cls.host, token=os.environ['DATABRICKS_TOKEN_TEST'])
+        
+        cls.test_uuid = uuid4()
+        entitlements = [iam.ComplexValue(value=ent) for ent in ['allow-cluster-create']]
+        groups = [iam.ComplexValue(value=g.id) for g in cls.admin_dbx.groups.list() if g.display_name in ['users']]
+        cls.sp = cls.admin_dbx.service_principals.create(display_name=f"test_existing_sp_{cls.test_uuid}",
+                                                         groups=groups,
+                                                         entitlements=entitlements)
+        
+        permissions_to_grant = [TokenAccessControlRequest(service_principal_name=cls.sp.application_id,
+                                                          permission_level=TokenPermissionLevel.CAN_USE)]
+        cls.admin_dbx.token_management.update_permissions(access_control_list=permissions_to_grant)
+    
+    def test_existing_service_principal(self):
+        """Test that setup uses existing service principal when existing_service_principal_id is provided and doesn't create a new one."""
+        test_uuid = uuid4()
+        zipher_sp_name = f'zipher_sp_existing_{test_uuid}'
+        
+        installer_config = InstallerConfig(
+            zipher_group_name=f'zipher_existing_sp_{test_uuid}',
+            zipher_service_principal_name=zipher_sp_name,
+            zipher_workspace_dir_path=f'/zipher_script_existing_{test_uuid}',
+            zipher_secret_scope_name=f'zipher_existing_{test_uuid}'
+        )
+        installer = ZipherInstaller(host=self.host, token=os.environ['DATABRICKS_TOKEN_TEST'], config=installer_config)
+        
+        user_config = InstallerUserConfig(
+            jobs_list=[],
+            existing_service_principal_id=self.sp.id
+        )
+        zipher_creds = installer.setup(user_config=user_config, skip_approval=True)
+        
+        assert zipher_creds is not None, "Setup should return credentials"
+        zipher_sps = [sp for sp in self.admin_dbx.service_principals.list() if sp.display_name == zipher_sp_name]
+        assert len(zipher_sps) == 0, "Should not create new SP when using existing_service_principal_id"
+        
+        # Verify existing SP is in the zipher group
+        group = [g for g in self.admin_dbx.groups.list() if g.display_name == installer_config.zipher_group_name][0]
+        group_details = self.admin_dbx.groups.get(id=group.id)
+        sp_in_group = any(member.value == self.sp.id for member in (group_details.members or []))
+        assert sp_in_group, f"Existing SP {self.sp.id} should be in group {installer_config.zipher_group_name}"
+        
+        # Verify existing SP has token permissions
+        token_perms = self.admin_dbx.token_management.get_permissions()
+        sp_has_token_perms = any(
+            hasattr(perm, 'service_principal_name') and perm.service_principal_name == self.sp.application_id
+            for perm in token_perms.access_control_list
+        )
+        assert sp_has_token_perms, f"Existing SP {self.sp.application_id} should have token permissions"
+        
+        installer.clean_resources()
+    
+    @classmethod
+    def tearDownClass(cls):
+        cls.admin_dbx.service_principals.delete(id=cls.sp.id)

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/tests/test_client.py

@@ -49,9 +49,6 @@ class TestClient(unittest.TestCase):
         res = self.client.update_existing_conf(job_id="1234", existing_conf=config_to_update)
         self.assertDictEqual(config_to_update, res)
 
-    def test_pydantic_version(self):
-        import pydantic
-        print(pydantic.__version__)
 
 if __name__ == '__main__':
     unittest.main()

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/zipher/acl/models.py

@@ -47,3 +47,4 @@ class InstallerUserConfig(BaseModel, extra='forbid', use_enum_values=True):
     jobs_list : Optional[List[str]] = None
     jobs_permission: JobPermissions = JobPermissions.CAN_MANAGE
     service_principal_token_type: ServicePrincipalTokenType = ServicePrincipalTokenType.OAUTH
+    existing_service_principal_id: Optional[str] = None

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/zipher/acl/zipher_installer.py

@@ -219,6 +219,29 @@ class ZipherInstaller:
 
         return service_principal
 
+    def _use_existing_service_principal(self, sp_id: str, zipher_group: Group) -> ServicePrincipal:
+        """Use an existing service principal and add it to the zipher group with token permissions."""
+        sp = self.dbx_client.service_principals.get(id=sp_id)
+        print(f"\nUsing existing service principal: {sp.display_name} (id={sp.id})")
+        
+        # Add existing SP to the zipher group (same as in _create_service_principal)
+        existing_groups = [g.value for g in sp.groups] if sp.groups else []
+        if zipher_group.id not in existing_groups:
+            updated_groups = existing_groups + [zipher_group.id]
+            self.dbx_client.service_principals.update(
+                id=sp.id,
+                display_name=sp.display_name,
+                groups=[iam.ComplexValue(value=gid) for gid in updated_groups]
+            )
+        
+        # Grant token permissions (same logic as _create_service_principal lines 214-218)
+        permissions_to_grant = [TokenAccessControlRequest(service_principal_name=sp.application_id,
+                                                          permission_level=TokenPermissionLevel.CAN_USE)]
+        self.dbx_client.token_management.update_permissions(access_control_list=permissions_to_grant)
+        print(f"Granted token permissions to existing service principal\n")
+        
+        return sp
+
     def _create_oauth_secret_for_sp(self, sp: ServicePrincipal):
         token = self.dbx_client.config.token or self.dbx_client.config.oauth_token().access_token
 
@@ -317,8 +340,11 @@ class ZipherInstaller:
 
         self._enable_job_permissions(user_config=user_config)
 
-        sp = self._create_service_principal(name=self.config.zipher_service_principal_name,
-                                            zipher_group=group)
+        if user_config.existing_service_principal_id:
+            sp = self._use_existing_service_principal(user_config.existing_service_principal_id, group)
+        else:
+            sp = self._create_service_principal(name=self.config.zipher_service_principal_name,
+                                                zipher_group=group)
 
         self._add_unity_catalog_permissions(sp)
 

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/zipher/cli.py

@@ -106,6 +106,13 @@ def main():
         help="Skip user input approval."
     )
 
+    setup_parser.add_argument(
+        "--existing-sp-id",
+        type=str,
+        default=None,
+        help="Use existing service principal by ID instead of creating a new one."
+    )
+
     remove_parser = subparsers.add_parser("remove", help="Remove Zipher resources from the workspace.", parents=[parent_parser])
 
     args = parser.parse_args()
@@ -127,7 +134,8 @@ def main():
                 max_runs=args.max_runs,
                 jobs_list=args.jobs_list,
                 jobs_permission=JobPermissions.CAN_VIEW if args.readonly else JobPermissions.CAN_MANAGE,
-                service_principal_token_type=ServicePrincipalTokenType.PERSONAL_ACCESS_TOKEN if args.pat else ServicePrincipalTokenType.OAUTH
+                service_principal_token_type=ServicePrincipalTokenType.PERSONAL_ACCESS_TOKEN if args.pat else ServicePrincipalTokenType.OAUTH,
+                existing_service_principal_id=args.existing_sp_id
             )
 
             zipher_token = zipher_acl.setup(user_config=config, skip_approval=args.skip_approval)

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2/zipher_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zipher-sdk
-Version: 0.3.9
+Version: 0.4.2
 Summary: Python SDK for programmatic access to the Zipher API
 Home-page: UNKNOWN
 Author: Zipher Inc.

{zipher-sdk-0.3.9 → zipher-sdk-0.4.2}/zipher_sdk.egg-info/requires.txt

@@ -1,3 +1,3 @@
-pydantic<3.0.0,>=2.7.3
+pydantic==2.11.3
 requests==2.32.3
 databricks-sdk==0.52.0