mindbridge-api-python-client 1.4.8__tar.gz → 1.4.9__tar.gz

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: mindbridge-api-python-client
-Version: 1.4.8
+Version: 1.4.9
 Summary: Interact with the MindBridge API
 Home-page: https://www.mindbridge.ai
 License: Proprietary
-Author: Edgar Silva
-Author-email: edgar.silva@mindbridge.ai
-Maintainer: Kevin Paulson
-Maintainer-email: kevin.paulson@mindbridge.ai
+Author: MBAI Support
+Author-email: mbaisupport@mindbridge.ai
+Maintainer: MBAI Support
+Maintainer-email: mbaisupport@mindbridge.ai
 Requires-Python: >=3.8.1,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Flake8
@@ -28,7 +28,6 @@ Classifier: Typing :: Typed
 Requires-Dist: pydantic (>=2.5.2,<3.0.0)
 Requires-Dist: typing-extensions (>=4.0.0,<5.0.0) ; python_version < "3.9"
 Requires-Dist: urllib3 (>=2.0.7,<3.0.0)
-Project-URL: Repository, https://github.com/mindbridge-ai/mindbridge-api-python-client
 Description-Content-Type: text/markdown
 
 <h1 align="center">MindBridge API Python Client</h1>

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/pyproject.toml

@@ -4,20 +4,20 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "mindbridge-api-python-client"
-version = "1.4.8"
+version = "1.4.9"
 description = "Interact with the MindBridge API"
 license = "Proprietary"
 authors = [
+    "MBAI Support <mbaisupport@mindbridge.ai>", # Must be first so that PyPI displays this
     "Edgar Silva <edgar.silva@mindbridge.ai>",
     "Jordan Hatcher <jordan.hatcher@mindbridge.ai>",
     "Kevin Paulson <kevin.paulson@mindbridge.ai",
     "Michael Smith <msmith@mindbridge.ai>",
     "Wing-Leung Chan <wing-leung.chan@mindbridge.ai>",
 ]
-maintainers = [ "Kevin Paulson <kevin.paulson@mindbridge.ai>" ]
+maintainers = [ "MBAI Support <mbaisupport@mindbridge.ai>" ]
 readme = "README.md"
 homepage = "https://www.mindbridge.ai"
-repository = "https://github.com/mindbridge-ai/mindbridge-api-python-client"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Framework :: Flake8",
@@ -50,7 +50,7 @@ urllib3 = "^2.0.7"
 optional = true
 
 [tool.poetry.group.generate_model.dependencies]
-datamodel-code-generator = "^0.25.1"
+datamodel-code-generator = "^0.26.0"
 
 [tool.poetry.group.lint]
 optional = true

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/analyses.py

@@ -56,11 +56,7 @@ class Analyses(BaseSet):
         url = self.base_url
         resp_dict = super()._create(url=url, json=item.create_json)
         analysis = AnalysisItem.model_validate(resp_dict)
-        self.restart_analysis_sources(analysis)
-        self.restart_data_tables(analysis)
-        self.restart_tasks(analysis)
-
-        return analysis
+        return self._restart_all_children(analysis)
 
     def update(self, item: AnalysisItem) -> AnalysisItem:
         if getattr(item, "id", None) is None:
@@ -70,11 +66,7 @@ class Analyses(BaseSet):
         resp_dict = super()._update(url=url, json=item.update_json)
 
         analysis = AnalysisItem.model_validate(resp_dict)
-        self.restart_analysis_sources(analysis)
-        self.restart_data_tables(analysis)
-        self.restart_tasks(analysis)
-
-        return analysis
+        return self._restart_all_children(analysis)
 
     def get(
         self, json: Optional[Dict[str, Any]] = None
@@ -85,11 +77,7 @@ class Analyses(BaseSet):
         url = f"{self.base_url}/query"
         for resp_dict in super()._get(url=url, json=json):
             analysis = AnalysisItem.model_validate(resp_dict)
-            self.restart_analysis_sources(analysis)
-            self.restart_data_tables(analysis)
-            self.restart_tasks(analysis)
-
-            yield analysis
+            yield self._restart_all_children(analysis)
 
     def delete(self, item: AnalysisItem) -> None:
         if getattr(item, "id", None) is None:
@@ -110,16 +98,7 @@ class Analyses(BaseSet):
             raise ItemNotFoundError
 
         url = f"{self.base_url}/{analysis_id}/run"
-        resp_dict = super()._create(url=url)
-        async_result = ApiAsyncResult.model_validate(resp_dict)
-
-        if async_result.type != AsyncResultType.ANALYSIS_RUN:
-            raise ItemError(f"Async Result Type was {async_result.type}.")
-
-        if async_result.entity_id != analysis_id:
-            raise UnexpectedServerError(
-                details="async_result.entity_id was not the same as the item id"
-            )
+        _ = super()._create(url=url)
 
         return self.get_by_id(analysis_id)
 
@@ -279,23 +258,22 @@ class Analyses(BaseSet):
 
         del check_interval_seconds
 
-        analysis_id = getattr(analysis, "id", None)
-        if analysis_id is None:
+        if analysis.id is None:
             raise ItemNotFoundError
 
         async_results = self.async_result_set.get(
             json={
                 "$and": [
-                    {"entityId": {"$eq": analysis_id}},
+                    {"entityId": {"$eq": analysis.id}},
                     {"type": {"$eq": AsyncResultType.ANALYSIS_RUN}},
                     {"entityType": {"$eq": EntityType.ANALYSIS}},
                 ]
             }
         )
         async_results_list = list(async_results)
-        if len(async_results_list) == 0:
+        if not async_results_list:
             raise ValidationError(
-                f"Unable to find {EntityType.ANALYSIS} run status for: {analysis_id}."
+                f"Unable to find {EntityType.ANALYSIS} run status for: {analysis.id}."
                 " Possibly the analysis has not been started yet?"
             )
 
@@ -309,7 +287,7 @@ class Analyses(BaseSet):
             init_interval_sec=76,
         )
 
-        return self.get_by_id(analysis_id)
+        return self.get_by_id(analysis.id)
 
     def roll_forward_analysis_to_engagement(
         self,
@@ -353,24 +331,28 @@ class Analyses(BaseSet):
         url = f"{self.base_url}/{id}"
         resp_dict = super()._get_by_id(url=url)
         analysis = AnalysisItem.model_validate(resp_dict)
+        return self._restart_all_children(analysis)
+
+    def _restart_all_children(self, analysis: AnalysisItem) -> AnalysisItem:
         self.restart_analysis_sources(analysis)
         self.restart_data_tables(analysis)
+        self.restart_tasks(analysis)
 
         return analysis
 
-    def restart_data_tables(self, analysis_item: AnalysisItem) -> None:
+    def restart_analysis_sources(self, analysis_item: AnalysisItem) -> None:
         if getattr(analysis_item, "id", None) is None:
             raise ItemNotFoundError
 
-        analysis_item.data_tables = DataTables(server=self.server).get(
+        analysis_item.analysis_sources = AnalysisSources(server=self.server).get(
             json={"analysisId": {"$eq": analysis_item.id}}
         )
 
-    def restart_analysis_sources(self, analysis_item: AnalysisItem) -> None:
+    def restart_data_tables(self, analysis_item: AnalysisItem) -> None:
         if getattr(analysis_item, "id", None) is None:
             raise ItemNotFoundError
 
-        analysis_item.analysis_sources = AnalysisSources(server=self.server).get(
+        analysis_item.data_tables = DataTables(server=self.server).get(
             json={"analysisId": {"$eq": analysis_item.id}}
         )
 

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/analysis_item.py

@@ -163,5 +163,5 @@ class AnalysisItem(ApiAnalysisRead):
                     days=1
                 )
 
-            earliest_period = AnalysisPeriod(start_date=start_date, end_date=end_date)  # type: ignore[call-arg]
+            earliest_period = AnalysisPeriod(start_date=start_date, end_date=end_date)
             self.analysis_periods.append(earliest_period)

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/base_set.py

@@ -39,34 +39,35 @@ class BaseSet:
     ) -> Generator[Dict[str, Any], None, None]:
         item_holder: List[Dict[str, Any]] = []
         page_number = 0
-        page_is_not_last = True
+        more_pages_to_check = True
 
-        while True:
-            if len(item_holder) != 0:
-                yield item_holder.pop(0)
-            elif page_is_not_last:
-                params = {"page": page_number}
-                request_url = f"{url}?{urlencode(params)}"
+        while item_holder or more_pages_to_check:
+            if not item_holder:
+                content = self._get_page(url=url, json=json, page_number=page_number)
 
-                resp = self.server.http.request("POST", request_url, json=json)
-                self._check_response(resp)
-                resp_dict = self._response_as_dict(resp)
+                if not content:
+                    more_pages_to_check = False
+                else:
+                    item_holder.extend(content)
+                    page_number = page_number + 1
 
-                if "last" not in resp_dict or not isinstance(resp_dict["last"], bool):
-                    raise UnexpectedServerError(f"{resp_dict}")
+            if item_holder:
+                yield item_holder.pop(0)
 
-                page_is_not_last = not resp_dict["last"]
+    def _get_page(
+        self, url: str, json: Dict[str, Any], page_number: int
+    ) -> List[Dict[str, Any]]:
+        params = {"page": page_number}
+        request_url = f"{url}?{urlencode(params)}"
 
-                if "content" not in resp_dict or not isinstance(
-                    resp_dict["content"], list
-                ):
-                    raise UnexpectedServerError(f"{resp_dict}")
+        resp = self.server.http.request("POST", request_url, json=json)
+        self._check_response(resp)
+        resp_dict = self._response_as_dict(resp)
 
-                item_holder.extend(resp_dict["content"])
+        if "content" not in resp_dict or not isinstance(resp_dict["content"], list):
+            raise UnexpectedServerError(f"{resp_dict}")
 
-                page_number = page_number + 1
-            else:
-                return  # No more items
+        return resp_dict["content"]
 
     def _create(
         self,

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/common_validators.py

@@ -62,10 +62,10 @@ def _convert_userinfo_to_useritem(v: Any) -> Any:
 
     prefix = "(API) "
     if v.user_name is None or not v.user_name.startswith(prefix):
-        return UserItem(id=v.user_id, first_name=v.user_name)  # type: ignore[call-arg]
+        return UserItem(id=v.user_id, first_name=v.user_name)
 
     prefix_len = len(prefix)
     first_name = v.user_name[prefix_len:]
-    return UserItem(  # type: ignore[call-arg]
+    return UserItem(
         id=v.user_id, first_name=first_name, last_name="", role=Role.ROLE_ADMIN
     )

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/data_tables.py

@@ -133,7 +133,7 @@ class DataTables(BaseSet):
             sort_direction = None
 
         url = f"{self.base_url}/{input_item.id}/export"
-        data_table_export_request = ApiDataTableExportRequest(  # type: ignore[call-arg]
+        data_table_export_request = ApiDataTableExportRequest(
             fields=fields,
             query=MindBridgeQueryTerm.model_construct(root=query),
             limit=limit,

{mindbridge_api_python_client-1.4.8 → mindbridge_api_python_client-1.4.9}/src/mindbridgeapi/file_manager.py

@@ -148,7 +148,7 @@ class FileManager(BaseSet):
 
         logger.info('Using the "Chunked Files" method')
         chunked_files = ChunkedFiles(server=self.server)
-        chunked_file = ChunkedFileItem(size=file_size, name=file_name)  # type: ignore[call-arg]
+        chunked_file = ChunkedFileItem(size=file_size, name=file_name)
         chunked_file = chunked_files.create(chunked_file)
 
         with open(input_file_path, "rb") as file: