rapidata 2.39.1__tar.gz → 2.40.0__tar.gz

{rapidata-2.39.1 → rapidata-2.40.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.39.1
+Version: 2.40.0
 Summary: Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way.
 License: Apache-2.0
 Author: Rapidata AG

{rapidata-2.39.1 → rapidata-2.40.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "2.39.1"
+version = "2.40.0"
 description = "Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way."
 authors = ["Rapidata AG <info@rapidata.ai>"]
 license = "Apache-2.0"

{rapidata-2.39.1 → rapidata-2.40.0}/src/rapidata/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.39.1"
+__version__ = "2.40.0"
 
 from .rapidata_client import (
     RapidataClient,

{rapidata-2.39.1 → rapidata-2.40.0}/src/rapidata/rapidata_client/config/order_config.py

@@ -10,5 +10,6 @@ class OrderConfig(BaseModel):
         autoValidationSetSize (int): The maximum size of the auto-generated validation set. Defaults to 20.
     """
 
+    autoValidationSetCreation: bool = Field(default=True)
     minOrderDatapointsForValidation: int = Field(default=50)
     autoValidationSetSize: int = Field(default=20)

{rapidata-2.39.1 → rapidata-2.40.0}/src/rapidata/rapidata_client/order/_rapidata_order_builder.py

@@ -1,5 +1,9 @@
 from typing import Literal, Optional, Sequence
 import random
+import urllib.parse
+import webbrowser
+
+from colorama import Fore
 from rapidata.api_client.models.ab_test_selection_a_inner import AbTestSelectionAInner
 from rapidata.api_client.models.and_user_filter_model_filters_inner import (
     AndUserFilterModelFiltersInner,
@@ -38,7 +42,6 @@ from rapidata.rapidata_client.workflow import Workflow
 from rapidata.service.openapi_service import OpenAPIService
 from rapidata.rapidata_client.api.rapidata_api_client import (
     suppress_rapidata_error_logging,
-    RapidataApiClient,
 )
 
 
@@ -124,16 +127,19 @@ class RapidataOrderBuilder:
             ),
         )
 
-    def _set_validation_set_id(self) -> None:
+    def _set_validation_set_id(self) -> bool:
         """
         Get the validation set ID for the order.
+
+        Returns:
+            bool: True if a new validation set was created, False otherwise.
         """
         assert self.__workflow is not None
         if self.__validation_set_id:
             logger.debug(
                 "Using specified validation set with ID: %s", self.__validation_set_id
             )
-            return
+            return False
 
         try:
             with suppress_rapidata_error_logging():
@@ -163,14 +169,12 @@ class RapidataOrderBuilder:
             logger.debug(
                 "No recommended validation set found, dataset too small to create one."
             )
-            return
+            return False
 
         logger.info("No recommended validation set found, creating new one.")
 
         managed_print()
-        managed_print(
-            f"No recommended validation set found, new one will be created.\nWe recommend adding some truths to ensure the order is accurate."
-        )
+        managed_print(f"No recommended validation set found, new one will be created.")
         validation_set = self.__validation_set_manager._create_order_validation_set(
             workflow=self.__workflow,
             order_name=self._name,
@@ -185,6 +189,7 @@ class RapidataOrderBuilder:
 
         logger.debug("New validation set created for order: %s", validation_set)
         self.__validation_set_id = validation_set.id
+        return True
 
     def _create(self) -> RapidataOrder:
         """
@@ -197,8 +202,10 @@ class RapidataOrderBuilder:
         Returns:
             RapidataOrder: The created RapidataOrder instance.
         """
-        if rapidata_config.enableBetaFeatures:
-            self._set_validation_set_id()
+        if rapidata_config.order.autoValidationSetCreation:
+            new_validation_set = self._set_validation_set_id()
+        else:
+            new_validation_set = False
 
         order_model = self._to_model()
         logger.debug("Creating order with model: %s", order_model)
@@ -210,6 +217,24 @@ class RapidataOrderBuilder:
         self.order_id = str(result.order_id)
         logger.debug("Order created with ID: %s", self.order_id)
 
+        if rapidata_config.order.autoValidationSetCreation and new_validation_set:
+            required_amount = min(int(len(self.__datapoints) * 0.01) or 1, 10)
+            managed_print()
+            managed_print(
+                Fore.YELLOW
+                + f"A new validation set was created. Please annotate {required_amount} datapoint{('s' if required_amount != 1 else '')} so the order runs correctly."
+                + Fore.RESET
+            )
+            link = f"https://app.{self.__openapi_service.environment}/validation-set/detail/{self.__validation_set_id}/annotate?orderId={self.order_id}&required={required_amount}"
+            could_open_browser = webbrowser.open(link)
+            if not could_open_browser:
+                encoded_url = urllib.parse.quote(link, safe="%/:=&?~#+!$,;'@()*[]")
+                managed_print(
+                    Fore.RED
+                    + f"Please open this URL in your browser: '{encoded_url}'"
+                    + Fore.RESET
+                )
+
         self.__dataset = (
             RapidataDataset(result.dataset_id, self.__openapi_service)
             if result.dataset_id

{rapidata-2.39.1 → rapidata-2.40.0}/src/rapidata/rapidata_client/rapidata_client.py

@@ -1,3 +1,5 @@
+import json
+from typing import Any
 import requests
 from packaging import version
 from rapidata import __version__
@@ -31,7 +33,7 @@ class RapidataClient:
         client_id: str | None = None,
         client_secret: str | None = None,
         environment: str = "rapidata.ai",
-        oauth_scope: str = "openid",
+        oauth_scope: str = "openid roles",
         cert_path: str | None = None,
         token: dict | None = None,
         leeway: int = 60,
@@ -51,10 +53,14 @@ class RapidataClient:
         Attributes:
             order (RapidataOrderManager): The RapidataOrderManager instance.
             validation (ValidationSetManager): The ValidationSetManager instance.
+            demographic (DemographicManager): The DemographicManager instance.
+            mri (RapidataBenchmarkManager): The RapidataBenchmarkManager instance.
         """
         with tracer.start_as_current_span("RapidataClient.__init__"):
             logger.debug("Checking version")
             self._check_version()
+            if environment != "rapidata.ai":
+                rapidata_config.logging.enable_otlp = False
 
             logger.debug("Initializing OpenAPIService")
             self._openapi_service = OpenAPIService(
@@ -83,13 +89,28 @@ class RapidataClient:
             logger.debug("Initializing RapidataBenchmarkManager")
             self.mri = RapidataBenchmarkManager(openapi_service=self._openapi_service)
 
+            self._check_beta_features()
+
     def reset_credentials(self):
         """Reset the credentials saved in the configuration file for the current environment."""
         self._openapi_service.reset_credentials()
 
-    def _enable_beta_features(self):
+    def _check_beta_features(self):
         """Enable beta features for the client."""
-        logger.debug("Enabling beta features")
+        result: dict[str, Any] = json.loads(
+            self._openapi_service.api_client.call_api(
+                "GET",
+                f"https://auth.{self._openapi_service.environment}/connect/userinfo",
+            )
+            .read()
+            .decode("utf-8")
+        )
+        logger.debug("Userinfo: %s", result)
+        if result.get("role") != ["Admin"]:
+            logger.debug("User is not an admin, not enabling beta features")
+            return
+
+        logger.debug("User is an admin, enabling beta features")
         rapidata_config.enableBetaFeatures = True
 
     def _check_version(self):

{rapidata-2.39.1 → rapidata-2.40.0}/src/rapidata/rapidata_client/validation/validation_set_manager.py

@@ -641,6 +641,10 @@ class ValidationSetManager:
         if dimensions:
             validation_set.update_dimensions(dimensions)
 
+        self.__openapi_service.validation_api.validation_set_validation_set_id_update_labeling_hints_post(
+            validation_set_id=validation_set_id
+        )
+
         return validation_set
 
     def get_validation_set_by_id(self, validation_set_id: str) -> RapidataValidationSet: