regula-facesdk-webclient 7.2.388.dev0__py3-none-any.whl → 8.1.433.dev0__py3-none-any.whl

regula/facesdk/webclient/__init__.py

@@ -1,10 +1,10 @@
 # compatibility import
 from regula.facesdk.webclient.ext import MatchImage, MatchRequest
-from regula.facesdk.webclient.gen.model.face_sdk_result import FaceSDKResult
-from regula.facesdk.webclient.gen.model.face_sdk_result_code import FaceSDKResultCode
-from regula.facesdk.webclient.gen.model.match_image_detection import MatchImageDetection
-from regula.facesdk.webclient.gen.model.match_image_result import MatchImageResult
-from regula.facesdk.webclient.gen.model.match_response import MatchResponse
+from regula.facesdk.webclient.gen.models.face_sdk_result import FaceSDKResult
+from regula.facesdk.webclient.gen.models.face_sdk_result_code import FaceSDKResultCode
+from regula.facesdk.webclient.gen.models.match_image_detection import MatchImageDetection
+from regula.facesdk.webclient.gen.models.match_image_result import MatchImageResult
+from regula.facesdk.webclient.gen.models.match_response import MatchResponse
 
 FaceRecognitionResult = FaceSDKResult
 FaceRecognitionResultCode = FaceSDKResultCode

regula/facesdk/webclient/ext/api/group_api.py

@@ -1,36 +1,11 @@
-from regula.facesdk.webclient.gen import ApiClient
 from regula.facesdk.webclient.gen.api.group_api import GroupApi as GenGroupApi
-from regula.facesdk.webclient.gen.model.group import Group
-from regula.facesdk.webclient.gen.model.group_page import GroupPage
-from regula.facesdk.webclient.gen.model.group_to_create import GroupToCreate
-from regula.facesdk.webclient.gen.model.persons_page import PersonsPage
-from regula.facesdk.webclient.gen.model.update_group import UpdateGroup
+from regula.facesdk.webclient.gen.models.group import Group
+from regula.facesdk.webclient.gen.models.group_to_create import GroupToCreate
 
 
 class GroupApi(GenGroupApi):
-    def __init__(self, api_client: ApiClient):
-        super().__init__(api_client)
-
     def create_group(self, group_name: str, metadata=None, **kwargs) -> Group:
         if metadata is None:
             metadata = {}
         group_to_create = GroupToCreate(name=group_name, metadata=metadata)
         return super().create_group(group_to_create, **kwargs)
-
-    def delete_group(self, group_id: str, **kwargs) -> None:
-        return super().delete_group(group_id, **kwargs)
-
-    def get_all_groups(self, **kwargs) -> GroupPage:
-        return super().get_all_groups(**kwargs)
-
-    def get_all_persons_by_group_id(self, group_id: str, **kwargs) -> PersonsPage:
-        return super().get_all_persons_by_group_id(group_id, **kwargs)
-
-    def get_group(self, group_id: str, **kwargs) -> Group:
-        return super().get_group(group_id, **kwargs)
-
-    def update_group(self, group_id: str, group_to_create: GroupToCreate, **kwargs) -> None:
-        return super().update_group(group_id, group_to_create, **kwargs)
-
-    def update_persons_in_group(self, group_id: str, update_group: UpdateGroup, **kwargs) -> None:
-        return super().update_persons_in_group(group_id, update_group, **kwargs)

regula/facesdk/webclient/ext/api/match_api.py

@@ -1,13 +1,5 @@
-from typing import List
-
 from regula.facesdk.webclient.gen import Configuration, ApiClient
-from regula.facesdk.webclient.gen.apis import MatchApi as GenMatchApi
-from regula.facesdk.webclient.ext.models import MatchRequest, DetectRequest
-from regula.facesdk.webclient.gen.model.detect_response import DetectResponse
-from regula.facesdk.webclient.gen.model.match_and_search_request import MatchAndSearchRequest
-from regula.facesdk.webclient.gen.model.match_and_search_request_all_of_images import MatchAndSearchRequestAllOfImages
-from regula.facesdk.webclient.gen.model.match_and_search_response import MatchAndSearchResponse
-from regula.facesdk.webclient.gen.model.match_response import MatchResponse
+from regula.facesdk.webclient.gen.api import MatchApi as GenMatchApi
 
 
 class MatchApi(GenMatchApi):
@@ -24,23 +16,5 @@ class MatchApi(GenMatchApi):
     def __enter__(self):
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.api_client.close()
-
-    def match_and_search(self, images: List[MatchAndSearchRequestAllOfImages], group_ids: List[int],
-                         limit: int = 100, threshold: float = 1.0) -> MatchAndSearchResponse:
-        body = MatchAndSearchRequest(
-            images=images,
-            group_ids=group_ids
-        )
-        return super().match_and_search(body)
-
-    def match(self, match_request: MatchRequest, **kwargs) -> MatchResponse:
-        return super().match(match_request, **kwargs)
-
-    # deprecated use match
-    def compare(self, compare_request: MatchRequest, **kwargs) -> MatchResponse:
-        return super().match(compare_request, **kwargs)
-
-    def detect(self, detect_request: DetectRequest, **kwargs) -> DetectResponse:
-        return super().detect(detect_request, **kwargs)
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass

regula/facesdk/webclient/ext/api/person_api.py

@@ -1,46 +1,20 @@
 import base64
 
-from regula.facesdk.webclient.gen import ApiClient
+from regula.facesdk.webclient.gen.models.add_image_to_person_request import AddImageToPersonRequest
+from regula.facesdk.webclient.gen.models.add_image_to_person_request_image import AddImageToPersonRequestImage
+from regula.facesdk.webclient.gen.models.add_image_to_person_response import AddImageToPersonResponse
 from regula.facesdk.webclient.gen.api.person_api import PersonApi as GenPersonApi
-from regula.facesdk.webclient.gen.model.image import Image
-from regula.facesdk.webclient.gen.model.image_fields import ImageFields
-from regula.facesdk.webclient.gen.model.image_fields_image import ImageFieldsImage
-from regula.facesdk.webclient.gen.model.image_page import ImagePage
-from regula.facesdk.webclient.gen.model.person import Person
-from regula.facesdk.webclient.gen.model.person_fields import PersonFields
-
+from regula.facesdk.webclient.gen.models.person import Person
+from regula.facesdk.webclient.gen.models.person_fields import PersonFields
+from uuid import UUID
 
 class PersonApi(GenPersonApi):
-    def __init__(self, api_client: ApiClient):
-        super().__init__(api_client)
-
-    def add_image_to_person(self, person_id: str, content: bytes, content_type: str = None, **kwargs) -> Image:
+    def add_image_to_person(self, person_id: UUID, content: bytes, content_type: str = None, **kwargs) -> AddImageToPersonResponse:
         base_image = base64.b64encode(content).decode("UTF-8")
-        image = ImageFields(image=ImageFieldsImage(content_type, base_image))
+        image = AddImageToPersonRequest(image=AddImageToPersonRequestImage(contentType=content_type, content=base_image))
         return super().add_image_to_person(person_id, image, **kwargs)
 
     def create_person(self, person_fields: PersonFields, **kwargs) -> Person:
         if person_fields.metadata is None:
             person_fields.metadata = {}
         return super().create_person(person_fields, **kwargs)
-
-    def delete_image_of_person(self, image_id: str, person_id: str, **kwargs) -> None:
-        return super().delete_image_of_person(image_id, person_id, **kwargs)
-
-    def delete_person(self, person_id: str, **kwargs) -> None:
-        return super().delete_person(person_id, **kwargs)
-
-    def get_all_groups_by_person_id(self, person_id: str, **kwargs):
-        return super().get_all_groups_by_person_id(person_id)
-
-    def get_all_images_by_person_id(self, person_id: str, **kwargs) -> ImagePage:
-        return super().get_all_images_by_person_id(person_id, **kwargs)
-
-    def get_image_of_person(self, image_id: str, person_id: str, **kwargs):
-        return super().get_image_of_person(image_id, person_id, **kwargs)
-
-    def get_person(self, person_id: str, **kwargs) -> Person:
-        return super().get_person(person_id, **kwargs)
-
-    def update_person(self, person_id: str, person_fields: PersonFields, **kwargs) -> None:
-        return super().update_person(person_id, person_fields, **kwargs)

regula/facesdk/webclient/ext/api/sdk.py

@@ -2,7 +2,7 @@ from regula.facesdk.webclient.ext.api import MatchApi
 from regula.facesdk.webclient.ext.api import PersonApi
 from regula.facesdk.webclient.ext.api.group_api import GroupApi
 from regula.facesdk.webclient.ext.api.search_api import SearchApi
-from regula.facesdk.webclient.gen import ApiClient, Configuration
+from regula.facesdk.webclient.gen import ApiClient, Configuration, HealthcheckApi, Liveness20Api
 
 
 class FaceSdk:
@@ -20,9 +20,11 @@ class FaceSdk:
         self.person_api = PersonApi(api_client=self.__api_client)
         self.group_api = GroupApi(api_client=self.__api_client)
         self.search_api = SearchApi(api_client=self.__api_client)
+        self.healthcheck = HealthcheckApi(api_client=self.__api_client)
+        self.liveness = Liveness20Api(api_client=self.__api_client)
 
     def __enter__(self):
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.__api_client.close()
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass

regula/facesdk/webclient/ext/api/search_api.py

@@ -1,15 +1,11 @@
 import base64
 
-from regula.facesdk.webclient.gen import ApiClient
 from regula.facesdk.webclient.gen.api.search_api import SearchApi as GenSearchApi
-from regula.facesdk.webclient.gen.model.search_request import SearchRequest
-from regula.facesdk.webclient.gen.model.search_result import SearchResult
+from regula.facesdk.webclient.gen.models.search_request import SearchRequest
+from regula.facesdk.webclient.gen.models.search_result import SearchResult
 
 
 class SearchApi(GenSearchApi):
-    def __init__(self, api_client: ApiClient):
-        super().__init__(api_client)
-
     def search(self, search_request: SearchRequest, **kwargs) -> SearchResult:
         image = search_request.image
         if image is not None:

regula/facesdk/webclient/ext/models/detect_request.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from regula.facesdk.webclient.ext.common import Base64String, bytes_to_base64
 from regula.facesdk.webclient.gen import ApiValueError
-from regula.facesdk.webclient.gen.model.process_param import ProcessParam
+from regula.facesdk.webclient.gen.models.process_param import ProcessParam
 from regula.facesdk.webclient.gen.models import DetectRequest as GetDetectRequest
 
 
@@ -11,9 +11,9 @@ class DetectRequest(GetDetectRequest):
             self,
             image: Union[Base64String, bytes],
             process_param: ProcessParam = None,
-            local_vars_configuration=None,
             tag=None,
-
+            env=None,
+            tenant=None
     ):
         if not image:
             raise ApiValueError(f"image: expected <not empty> - obtained <{image}>", "image")
@@ -23,7 +23,8 @@ class DetectRequest(GetDetectRequest):
 
         super().__init__(
             image=image,
-            local_vars_configuration=local_vars_configuration,
             tag=tag,
-            process_param=process_param
+            process_param=process_param,
+            env=env,
+            tenant=tenant
         )

regula/facesdk/webclient/ext/models/match_image.py

@@ -2,12 +2,12 @@ from typing import Union
 
 from regula.facesdk.webclient.ext.common import Base64String, bytes_to_base64
 from regula.facesdk.webclient.gen import ApiValueError
-from regula.facesdk.webclient.gen.model.image_source import ImageSource
+from regula.facesdk.webclient.gen.models.image_source import ImageSource
 from regula.facesdk.webclient.gen.models import MatchImage as GenMatchImage
 
 
 class MatchImage(GenMatchImage):
-    def __init__(self, index=None, type=None, data: Union[Base64String, bytes] = None, local_vars_configuration=None):
+    def __init__(self, index=None, type=None, data: Union[Base64String, bytes] = None, detect_all=None):
         if not data:
             raise ApiValueError(f"compare image {index} data: expected <not empty>")
 
@@ -16,4 +16,4 @@ class MatchImage(GenMatchImage):
         if isinstance(data, bytes):
             data = bytes_to_base64(data)
 
-        super().__init__(index, type, data, local_vars_configuration)
+        super().__init__(index=index, type=type, data=data, detectAll=detect_all)

regula/facesdk/webclient/ext/models/match_request.py

@@ -10,9 +10,10 @@ class MatchRequest(GenMatchRequest):
     def __init__(
             self,
             images: List[Union[MatchImage, Base64String, bytes]],
-            local_vars_configuration=None,
             output_image_params=None,
-            tag=None
+            tag=None,
+            env=None,
+            tenant=None
     ):
         if not images:
             raise ApiValueError(f"compare request images: expected size <more than 1>")
@@ -22,11 +23,12 @@ class MatchRequest(GenMatchRequest):
             if isinstance(item, MatchImage):
                 input_images.append(item)
             else:
-                input_images.append(MatchImage(index, None, item, local_vars_configuration))
+                input_images.append(MatchImage(index, None, item))
 
         super().__init__(
             images=input_images,
-            local_vars_configuration=local_vars_configuration,
             output_image_params=output_image_params,
-            tag=tag
+            tag=tag,
+            env=env,
+            tenant=tenant
         )