wizata-dsapi 2.1.0.dev15__tar.gz → 2.1.0.dev17__tar.gz

{wizata_dsapi-2.1.0.dev15 → wizata_dsapi-2.1.0.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.1.0.dev15
+Version: 2.1.0.dev17
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com
@@ -91,8 +91,54 @@ Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "std"
 Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "std"
 Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "std"
 Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "std"
-Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "std"
-Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "std"
+Provides-Extra: torch
+Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "torch"
+Requires-Dist: numpy==1.26.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: numpy>=2.3.3; python_version >= "3.12" and extra == "torch"
+Requires-Dist: dill==0.3.6; python_version < "3.12" and extra == "torch"
+Requires-Dist: dill==0.4.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: protobuf==3.20.3; python_version < "3.12" and extra == "torch"
+Requires-Dist: protobuf>=5.29.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: msal==1.30.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: msal>=1.34.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: joblib==1.5.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: joblib>=1.2.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: requests<3,>=2.32.5; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: requests>=2.32.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: setuptools<81,>=80.9.0; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: setuptools>=80.9.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: plotly==5.13.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: plotly>=6.3.1; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytz<2027,>=2026.1; extra == "torch"
+Requires-Dist: matplotlib<3.11,>=3.10.6; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: matplotlib>=3.10.6; python_version >= "3.12" and extra == "torch"
+Requires-Dist: scikit-learn==1.2.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: scikit-learn>=1.7.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: adtk==0.6.2; extra == "torch"
+Requires-Dist: scipy==1.10.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: scipy>=1.16.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: xgboost==1.7.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: xgboost>=3.0.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: u8darts==0.25.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: u8darts>=0.38.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: optuna==3.3.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: optuna>=4.5.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: explainerdashboard==0.4.2.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: ipywidgets==8.0.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: ipywidgets>=8.1.7; python_version >= "3.12" and extra == "torch"
+Requires-Dist: kaleido==0.2.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: kaleido>=1.1.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytest==7.2.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: pytest>=8.4.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytest-cov==4.0.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: pytest-cov>=7.0.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "torch"
+Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "torch"
 Provides-Extra: julia
 Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "julia"
 Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "julia"

{wizata_dsapi-2.1.0.dev15 → wizata_dsapi-2.1.0.dev17}/setup.py

@@ -81,7 +81,13 @@ setup(
     install_requires=core_dependencies,
     extras_require={
         'slim':  core_dependencies,
-        'std':   core_dependencies + ml_dependencies + torch_dependencies,
+        # DEV-6008: torch is no longer part of 'std'. It is a multi-GB dependency that
+        # every std runner carried whether or not a pipeline used it, and its 3.11 pin
+        # is the constraint that made that build fragile. Pipelines that need it now
+        # ask for it: wizata_dsapi[torch]. The runtime already treats it as optional
+        # (wizata_dsapi.HAS_TORCH), so 'std' losing it changes no behaviour.
+        'std':   core_dependencies + ml_dependencies,
+        'torch': core_dependencies + ml_dependencies + torch_dependencies,
         'julia': core_dependencies + ml_dependencies + julia_dependencies,
         'all':   ['wizata-dsapi-extras-all-removed-pick-std-or-other==999.0.0'],
     },

wizata_dsapi-2.1.0.dev17/wizata_dsapi/plot.py

@@ -0,0 +1,104 @@
+import uuid
+from .api_dto import ApiDto
+
+
+class Plot(ApiDto):
+    """
+    A plot is a definition of a Plotly figure that can be stored and shared on Wizata.
+    :ivar plot_id: The UUID of the plot. None for a deployed plot, which is addressed
+        by ``key`` instead — see below.
+    :ivar name: A simple name helping the user identifying the plot.
+    :ivar figure: Plotly figure defining the plot itself.
+    :ivar key: DEV-6026 — the deterministic identity of a DEPLOYED plot,
+        ``<pipeline key>/<twin key>/<plot script>.<input dataframe>``. An experiment
+        plot is one blob per execution addressed by ``plot_id`` and fetched with
+        ``GET /plots/<id>/``; a deployed plot is one blob per (pipeline, twin, plot
+        step) that is overwritten, so it has no uuid at all. `plot_id` is deliberately
+        left None in that case rather than minted and dropped: a uuid that looks
+        addressable via ``GET /plots/<id>`` but is not would be its own trap. Note the
+        identity is the plot STEP — its script and input dataframe, both from the
+        pipeline definition — and not ``name``, which stays the display label, so
+        relabelling a chart cannot orphan its blob.
+    """
+
+    @classmethod
+    def route(cls):
+        return "plots"
+
+    @classmethod
+    def from_dict(cls, data):
+        obj = Plot()
+        obj.from_json(data)
+        return obj
+
+    def __init__(self, plot_id=None, name=None, figure=None, key=None):
+        # A keyed (deployed) plot gets NO uuid — see the `key` note on the class.
+        # Every other plot keeps minting one, so nothing that existed changes.
+        if plot_id is not None:
+            self.plot_id = plot_id
+        elif key is not None:
+            self.plot_id = None
+        else:
+            self.plot_id = uuid.uuid4()
+        self.name = name
+        self.figure = figure
+        self.key = key
+
+    def api_id(self) -> str:
+        """
+        Id of the plot (plot_id)
+        :return: string formatted UUID of the plot, None for a deployed plot — it is
+            not a backend entity, so there is no id to send.
+        """
+        if self.plot_id is None:
+            return None
+        return str(self.plot_id).upper()
+
+    def endpoint(self) -> str:
+        """
+        Name of the endpoints used to manipulate plots.
+        :return: Endpoint name.
+        """
+        return "Plots"
+
+    def from_json(self, obj):
+        """
+        Load the Plot entity from a dictionary representation of the Plot.
+        :param obj: Dict version of the Plot.
+        """
+        if "id" in obj.keys():
+            self.plot_id = uuid.UUID(obj["id"])
+        if "key" in obj.keys():
+            # A deployed plot: keyed, never uuid-addressed. Clearing plot_id undoes
+            # the uuid __init__ minted before from_json ran, so a round-tripped
+            # execution log does not grow a uuid that addresses nothing.
+            self.key = obj["key"]
+            self.plot_id = None
+        if "name" in obj.keys():
+            self.name = obj["name"]
+        if "figure" in obj.keys():
+            self.figure = obj["figure"]
+
+    def to_json(self, target: str = None):
+        """
+        Convert the plot to a dictionary compatible to JSON format.
+        :return: dictionary representation of the Plot object.
+        """
+        # A deployed plot carries its deterministic key and NO id. The execution log
+        # is what makes it traceable which run last wrote a plot, and `key` is what
+        # the deployed-plot endpoint reads — an "id" beside it would only invite a
+        # GET /plots/<id> that cannot answer.
+        if self.key is not None:
+            obj = {
+                "key": self.key
+            }
+        else:
+            obj = {
+                "id": str(self.plot_id)
+            }
+        if self.name is not None:
+            obj["name"] = self.name
+        if target is None or target != 'logs':
+            if self.figure is not None:
+                obj["figure"] = self.figure
+        return obj

wizata_dsapi-2.1.0.dev17/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.1.0.dev17"

{wizata_dsapi-2.1.0.dev15 → wizata_dsapi-2.1.0.dev17}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.1.0.dev15
+Version: 2.1.0.dev17
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com
@@ -91,8 +91,54 @@ Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "std"
 Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "std"
 Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "std"
 Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "std"
-Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "std"
-Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "std"
+Provides-Extra: torch
+Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "torch"
+Requires-Dist: numpy==1.26.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: numpy>=2.3.3; python_version >= "3.12" and extra == "torch"
+Requires-Dist: dill==0.3.6; python_version < "3.12" and extra == "torch"
+Requires-Dist: dill==0.4.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: protobuf==3.20.3; python_version < "3.12" and extra == "torch"
+Requires-Dist: protobuf>=5.29.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: msal==1.30.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: msal>=1.34.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: joblib==1.5.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: joblib>=1.2.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: requests<3,>=2.32.5; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: requests>=2.32.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: setuptools<81,>=80.9.0; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: setuptools>=80.9.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: plotly==5.13.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: plotly>=6.3.1; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytz<2027,>=2026.1; extra == "torch"
+Requires-Dist: matplotlib<3.11,>=3.10.6; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: matplotlib>=3.10.6; python_version >= "3.12" and extra == "torch"
+Requires-Dist: scikit-learn==1.2.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: scikit-learn>=1.7.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: adtk==0.6.2; extra == "torch"
+Requires-Dist: scipy==1.10.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: scipy>=1.16.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: xgboost==1.7.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: xgboost>=3.0.5; python_version >= "3.12" and extra == "torch"
+Requires-Dist: u8darts==0.25.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: u8darts>=0.38.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: optuna==3.3.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: optuna>=4.5.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: explainerdashboard==0.4.2.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: ipywidgets==8.0.4; python_version < "3.12" and extra == "torch"
+Requires-Dist: ipywidgets>=8.1.7; python_version >= "3.12" and extra == "torch"
+Requires-Dist: kaleido==0.2.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: kaleido>=1.1.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytest==7.2.2; python_version < "3.12" and extra == "torch"
+Requires-Dist: pytest>=8.4.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pytest-cov==4.0.0; python_version < "3.12" and extra == "torch"
+Requires-Dist: pytest-cov>=7.0.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "torch"
+Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "torch"
+Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "torch"
+Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "torch"
+Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "torch"
+Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "torch"
 Provides-Extra: julia
 Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "julia"
 Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "julia"

{wizata_dsapi-2.1.0.dev15 → wizata_dsapi-2.1.0.dev17}/wizata_dsapi.egg-info/requires.txt

@@ -139,7 +139,6 @@ pandas==2.2.3
 requests<3,>=2.32.5
 setuptools<81,>=80.9.0
 matplotlib<3.11,>=3.10.6
-torch==2.7.1
 
 [std:python_version >= "3.12"]
 pandas>=2.3.3
@@ -163,4 +162,58 @@ pytest>=8.4.2
 pytest-cov>=7.0.0
 shapely>=2.1.2
 pyodbc>=5.2.0
+
+[torch]
+pytz<2027,>=2026.1
+adtk==0.6.2
+
+[torch:python_version < "3.12"]
+numpy==1.26.4
+dill==0.3.6
+protobuf==3.20.3
+msal==1.30.0
+joblib==1.5.2
+plotly==5.13.1
+scikit-learn==1.2.2
+scipy==1.10.1
+xgboost==1.7.4
+u8darts==0.25.0
+optuna==3.3.0
+explainerdashboard==0.4.2.1
+ipywidgets==8.0.4
+kaleido==0.2.1
+pytest==7.2.2
+pytest-cov==4.0.0
+shapely==2.0.1
+pyodbc==4.0.35
+
+[torch:python_version >= "3.11" and python_version < "3.12"]
+pandas==2.2.3
+requests<3,>=2.32.5
+setuptools<81,>=80.9.0
+matplotlib<3.11,>=3.10.6
+torch==2.7.1
+
+[torch:python_version >= "3.12"]
+pandas>=2.3.3
+numpy>=2.3.3
+dill==0.4.0
+protobuf>=5.29.5
+msal>=1.34.0
+joblib>=1.2.0
+requests>=2.32.5
+setuptools>=80.9.0
+plotly>=6.3.1
+matplotlib>=3.10.6
+scikit-learn>=1.7.2
+scipy>=1.16.2
+xgboost>=3.0.5
+u8darts>=0.38.0
+optuna>=4.5.0
+ipywidgets>=8.1.7
+kaleido>=1.1.0
+pytest>=8.4.2
+pytest-cov>=7.0.0
+shapely>=2.1.2
+pyodbc>=5.2.0
 torch>=2.8.0

wizata_dsapi-2.1.0.dev15/wizata_dsapi/plot.py

@@ -1,70 +0,0 @@
-import uuid
-from .api_dto import ApiDto
-
-
-class Plot(ApiDto):
-    """
-    A plot is a definition of a Plotly figure that can be stored and shared on Wizata.
-    :ivar plot_id: The UUID of the plot.
-    :ivar name: A simple name helping the user identifying the plot.
-    :ivar figure: Plotly figure defining the plot itself.
-    """
-
-    @classmethod
-    def route(cls):
-        return "plots"
-
-    @classmethod
-    def from_dict(cls, data):
-        obj = Plot()
-        obj.from_json(data)
-        return obj
-
-    def __init__(self, plot_id=None, name=None, figure=None):
-        if plot_id is None:
-            self.plot_id = uuid.uuid4()
-        else:
-            self.plot_id = plot_id
-        self.name = name
-        self.figure = figure
-
-    def api_id(self) -> str:
-        """
-        Id of the plot (plot_id)
-        :return: string formatted UUID of the plot.
-        """
-        return str(self.plot_id).upper()
-
-    def endpoint(self) -> str:
-        """
-        Name of the endpoints used to manipulate plots.
-        :return: Endpoint name.
-        """
-        return "Plots"
-
-    def from_json(self, obj):
-        """
-        Load the Plot entity from a dictionary representation of the Plot.
-        :param obj: Dict version of the Plot.
-        """
-        if "id" in obj.keys():
-            self.plot_id = uuid.UUID(obj["id"])
-        if "name" in obj.keys():
-            self.name = obj["name"]
-        if "figure" in obj.keys():
-            self.figure = obj["figure"]
-
-    def to_json(self, target: str = None):
-        """
-        Convert the plot to a dictionary compatible to JSON format.
-        :return: dictionary representation of the Plot object.
-        """
-        obj = {
-            "id": str(self.plot_id)
-        }
-        if self.name is not None:
-            obj["name"] = self.name
-        if target is None or target != 'logs':
-            if self.figure is not None:
-                obj["figure"] = self.figure
-        return obj

wizata_dsapi-2.1.0.dev15/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.1.0.dev15"