update data

Author: sebastianMindee

mindee/client_v2.py

@@ -67,7 +67,6 @@ def enqueue(
 
         :param input_source: The document/source file to use. Can be local or remote.
         :param params: Parameters to set when sending a file.
-        :param slug: Slug for the endpoint.
 
         :return: A valid inference response.
         """
@@ -114,6 +113,27 @@ def get_inference(
         return self.get_result(inference_id, response_type)
 
     def get_result(
+        self,
+        inference_id: str,
+        response_type: Optional[Type[BaseResponse]] = InferenceResponse,
+    ) -> BaseResponse:
+        """
+        Get the result of an inference that was previously enqueued.
+
+        The inference will only be available after it has finished processing.
+
+        :param inference_id: UUID of the inference to retrieve.
+        :param response_type: Class of the product to instantiate.
+        :return: An inference response.
+        """
+        response_type = response_type or InferenceResponse
+        response = self._get_result(inference_id, response_type)
+        assert isinstance(response, response_type), (
+            f'Invalid response type "{type(response)}"'
+        )
+        return response
+
+    def _get_result(
         self,
         inference_id: str,
         response_type: Type[BaseResponse] = InferenceResponse,

mindee/input/base_parameters.py

@@ -23,7 +23,7 @@ class BaseParameters(ABC):
     close_file: bool = True
     """Whether to close the file after product."""
 
-    def get_config(self) -> Dict[str, Union[str, List[str]]]:
+    def get_form_data(self) -> Dict[str, Union[str, List[str]]]:
         """
         Return the parameters as a config dictionary.
 

mindee/input/inference_parameters.py

@@ -112,13 +112,13 @@ def __post_init__(self):
         elif isinstance(self.data_schema, dict):
             self.data_schema = DataSchema(**self.data_schema)
 
-    def get_config(self) -> Dict[str, Union[str, List[str]]]:
+    def get_form_data(self) -> Dict[str, Union[str, List[str]]]:
         """
         Return the parameters as a config dictionary.
 
         :return: A dict of parameters.
         """
-        data = super().get_config()
+        data = super().get_form_data()
         if self.data_schema is not None:
             data["data_schema"] = str(self.data_schema)
         if self.rag is not None:

mindee/mindee_http/mindee_api_v2.py

@@ -84,7 +84,7 @@ def req_post_inference_enqueue(
         :param slug: Slug to use for the enqueueing, defaults to 'inferences'.
         :return: requests response.
         """
-        data = params.get_config()
+        data = params.get_form_data()
         url = f"{self.url_root}/{slug}/enqueue"
 
         if isinstance(input_source, LocalInputSource):

tests/data

@@ -5,7 +5,7 @@
 from mindee import ClientV2, PathInput
 from mindee.input import SplitParameters
 from mindee.v2 import SplitResponse
-from tests.utils import V1_PRODUCT_DATA_DIR
+from tests.utils import V2_UTILITIES_DATA_DIR
 
 
 @pytest.fixture(scope="session")
@@ -16,20 +16,13 @@ def split_model_id() -> str:
 
 @pytest.fixture(scope="session")
 def v2_client() -> ClientV2:
-    """
-    Real V2 client configured with the user-supplied API key
-    (or skipped when the key is absent).
-    """
-    api_key = os.getenv("MINDEE_V2_API_KEY")
-    return ClientV2(api_key)
+    return ClientV2()
 
 
 @pytest.mark.integration
 @pytest.mark.v2
 def test_split_blank(v2_client: ClientV2, split_model_id: str):
-    input_source = PathInput(
-        V1_PRODUCT_DATA_DIR / "invoice_splitter" / "default_sample.pdf"
-    )
+    input_source = PathInput(V2_UTILITIES_DATA_DIR / "split" / "default_sample.pdf")
     response = v2_client.enqueue_and_get_result(
         SplitResponse, input_source, SplitParameters(split_model_id)
     )  # Note: do not use blank_1.pdf for this.

tests/v2/parsing/test_split_integration.py

@@ -10,7 +10,9 @@
 
 @pytest.mark.v2
 def test_split_single():
-    input_inference = LocalResponse(V2_UTILITIES_DATA_DIR / "split_single.json")
+    input_inference = LocalResponse(
+        V2_UTILITIES_DATA_DIR / "split" / "split_single.json"
+    )
     split_response = input_inference.deserialize_response(SplitResponse)
     assert isinstance(split_response.inference, SplitInference)
     assert split_response.inference.result.splits
@@ -22,7 +24,9 @@ def test_split_single():
 
 @pytest.mark.v2
 def test_split_multiple():
-    input_inference = LocalResponse(V2_UTILITIES_DATA_DIR / "split_multiple.json")
+    input_inference = LocalResponse(
+        V2_UTILITIES_DATA_DIR / "split" / "split_multiple.json"
+    )
     split_response = input_inference.deserialize_response(SplitResponse)
     assert isinstance(split_response.inference, SplitInference)
     assert isinstance(split_response.inference.result, SplitResult)

tests/v2/parsing/test_split_response.py

@@ -18,12 +18,7 @@ def findoc_model_id() -> str:
 
 @pytest.fixture(scope="session")
 def v2_client() -> ClientV2:
-    """
-    Real V2 client configured with the user-supplied API key
-    (or skipped when the key is absent).
-    """
-    api_key = os.getenv("MINDEE_V2_API_KEY")
-    return ClientV2(api_key)
+    return ClientV2()
 
 
 def _basic_assert_success(