oracle-ads 2.13.13__py3-none-any.whl → 2.13.15__py3-none-any.whl

ads/feature_engineering/feature_type/lat_long.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -15,22 +14,24 @@ Functions:
     default_handler(data: pd.Series) -> pd.Series
         Processes given data and indicates if the data matches requirements.
 """
+
+import re
+
 import matplotlib.pyplot as plt
 import pandas as pd
-import re
+
+from ads.common.decorator.runtime_dependency import (
+    OptionalDependency,
+    runtime_dependency,
+)
+from ads.feature_engineering import schema
 from ads.feature_engineering.feature_type.string import String
 from ads.feature_engineering.utils import (
-    _count_unique_missing,
-    _str_lat_long_to_point,
     SchemeNeutral,
     SchemeTeal,
+    _count_unique_missing,
+    _str_lat_long_to_point,
 )
-from ads.feature_engineering import schema
-from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
-    OptionalDependency,
-)
-
 
 PATTERN = re.compile(r"^[(]?(\-?\d+\.\d+?),\s*(\-?\d+\.\d+?)[)]?$", re.VERBOSE)
 
@@ -131,7 +132,7 @@ class LatLong(String):
                     "-44.510428,-169.269477",
                     "-56.3344375,-166.407038",
                     "",
-                    np.NaN,
+                    np.nan,
                     None
                 ],
             name='latlong'
@@ -170,7 +171,7 @@ class LatLong(String):
                     "-44.510428,-169.269477",
                     "-56.3344375,-166.407038",
                     "",
-                    np.NaN,
+                    np.nan,
                     None
                 ],
             name='latlong'
@@ -226,7 +227,7 @@ class LatLong(String):
             "-44.510428,-169.269477",
             "-56.3344375,-166.407038",
             "",
-            np.NaN,
+            np.nan,
             None
             ],
             name='latlong'

ads/feature_engineering/feature_type/phone_number.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -15,12 +14,14 @@ Functions:
     default_handler(data: pd.Series) -> pd.Series
         Processes given data and indicates if the data matches requirements.
 """
-import pandas as pd
+
 import re
+
+import pandas as pd
+
+from ads.feature_engineering import schema
 from ads.feature_engineering.feature_type.string import String
 from ads.feature_engineering.utils import _count_unique_missing
-from ads.feature_engineering import schema
-
 
 PATTERN = re.compile(
     r"^(\+?\d{1,2}[\s-])?\(?(\d{3})\)?[\s.-]?\d{3}[\s.-]?\d{4}$", re.VERBOSE
@@ -91,7 +92,7 @@ class PhoneNumber(String):
 
         Examples
         --------
-        >>> s = pd.Series(['2068866666', '6508866666', '2068866666', '', np.NaN, np.nan, None], name='phone')
+        >>> s = pd.Series(['2068866666', '6508866666', '2068866666', '', np.nan, np.nan, None], name='phone')
         >>> s.ads.feature_type = ['phone_number']
         >>> s.ads.feature_stat()
             Metric  Value
@@ -113,7 +114,7 @@ class PhoneNumber(String):
 
         Examples
         --------
-        >>> s = pd.Series(['2068866666', '6508866666', '2068866666', '', np.NaN, np.nan, None], name='phone')
+        >>> s = pd.Series(['2068866666', '6508866666', '2068866666', '', np.nan, np.nan, None], name='phone')
         >>> s.ads.feature_type = ['phone_number']
         >>> s.ads.feature_domain()
         constraints: []

ads/feature_engineering/feature_type/string.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -11,19 +10,20 @@ Classes:
     String
         The feature type that represents string values.
 """
+
 import matplotlib.pyplot as plt
 import pandas as pd
+
+from ads.common.decorator.runtime_dependency import (
+    OptionalDependency,
+    runtime_dependency,
+)
+from ads.feature_engineering import schema
 from ads.feature_engineering.feature_type.base import FeatureType
 from ads.feature_engineering.utils import (
+    SchemeNeutral,
     _count_unique_missing,
     random_color_func,
-    SchemeNeutral,
-)
-from ads.feature_engineering import schema
-from ads.common import utils, logger
-from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
-    OptionalDependency,
 )
 
 
@@ -89,7 +89,7 @@ class String(FeatureType):
         Examples
         --------
         >>> string = pd.Series(['S', 'C', 'S', 'S', 'S', 'Q', 'S', 'S', 'S', 'C', 'S', 'S', 'S',
-                'S', 'S', 'S', 'Q', 'S', 'S', '', np.NaN, None], name='string')
+                'S', 'S', 'S', 'Q', 'S', 'S', '', np.nan, None], name='string')
         >>> string.ads.feature_type = ['string']
         >>> string.ads.feature_stat()
             Metric  Value
@@ -113,7 +113,7 @@ class String(FeatureType):
         Examples
         --------
         >>> string = pd.Series(['S', 'C', 'S', 'S', 'S', 'Q', 'S', 'S', 'S', 'C', 'S', 'S', 'S',
-                'S', 'S', 'S', 'Q', 'S', 'S', '', np.NaN, None], name='string')
+                'S', 'S', 'S', 'Q', 'S', 'S', '', np.nan, None], name='string')
         >>> string.ads.feature_type = ['string']
         >>> string.ads.feature_plot()
 
@@ -149,7 +149,7 @@ class String(FeatureType):
         Examples
         --------
         >>> string = pd.Series(['S', 'C', 'S', 'S', 'S', 'Q', 'S', 'S', 'S', 'C', 'S', 'S', 'S',
-                'S', 'S', 'S', 'Q', 'S', 'S', '', np.NaN, None], name='string')
+                'S', 'S', 'S', 'Q', 'S', 'S', '', np.nan, None], name='string')
         >>> string.ads.feature_type = ['string']
         >>> string.ads.feature_domain()
         constraints: []

ads/feature_engineering/feature_type/text.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -11,16 +10,16 @@ Classes:
     Text
         The Text feature type.
 """
+
 import matplotlib.pyplot as plt
 import pandas as pd
-from ads.feature_engineering.feature_type.string import String
-from ads.feature_engineering.utils import random_color_func, SchemeNeutral
 
-from ads.common import utils, logger
 from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
     OptionalDependency,
+    runtime_dependency,
 )
+from ads.feature_engineering.feature_type.string import String
+from ads.feature_engineering.utils import SchemeNeutral, random_color_func
 
 
 class Text(String):
@@ -53,7 +52,7 @@ class Text(String):
         Examples
         --------
         >>> text = pd.Series(['S', 'C', 'S', 'S', 'S', 'Q', 'S', 'S', 'S', 'C', 'S', 'S', 'S',
-                'S', 'S', 'S', 'Q', 'S', 'S', '', np.NaN, None], name='text')
+                'S', 'S', 'S', 'Q', 'S', 'S', '', np.nan, None], name='text')
         >>> text.ads.feature_type = ['text']
         >>> text.ads.feature_plot()
 

ads/feature_engineering/feature_type/zip_code.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -15,17 +14,20 @@ Functions:
     default_handler(data: pd.Series) -> pd.Series
         Processes given data and indicates if the data matches requirements.
 """
+
+import re
+
 import matplotlib.pyplot as plt
 import pandas as pd
-import re
+
+from ads.feature_engineering import schema
 from ads.feature_engineering.feature_type.string import String
 from ads.feature_engineering.utils import (
     _count_unique_missing,
-    _to_lat_long,
     _plot_gis_scatter,
+    _to_lat_long,
     _zip_code,
 )
-from ads.feature_engineering import schema
 
 PATTERN = re.compile(r"^[0-9]{5}(?:-[0-9]{4})?$", re.VERBOSE)
 
@@ -78,7 +80,7 @@ class ZipCode(String):
     >>> from ads.feature_engineering.feature_type.zip_code import ZipCode
     >>> import pandas as pd
     >>> import numpy as np
-    >>> s = pd.Series(["94065", "90210", np.NaN, None], name='zipcode')
+    >>> s = pd.Series(["94065", "90210", np.nan, None], name='zipcode')
     >>> ZipCode.validator.is_zip_code(s)
     0     True
     1     True
@@ -97,7 +99,7 @@ class ZipCode(String):
 
         Examples
         --------
-        >>> zipcode = pd.Series([94065, 90210, np.NaN, None], name='zipcode')
+        >>> zipcode = pd.Series([94065, 90210, np.nan, None], name='zipcode')
         >>> zipcode.ads.feature_type = ['zip_code']
         >>> zipcode.ads.feature_stat()
             Metric  Value
@@ -119,7 +121,7 @@ class ZipCode(String):
 
         Examples
         --------
-        >>> zipcode = pd.Series([94065, 90210, np.NaN, None], name='zipcode')
+        >>> zipcode = pd.Series([94065, 90210, np.nan, None], name='zipcode')
         >>> zipcode.ads.feature_type = ['zip_code']
         >>> zipcode.ads.feature_plot()
         Returns
@@ -138,7 +140,7 @@ class ZipCode(String):
 
         Examples
         --------
-        >>> zipcode = pd.Series([94065, 90210, np.NaN, None], name='zipcode')
+        >>> zipcode = pd.Series([94065, 90210, np.nan, None], name='zipcode')
         >>> zipcode.ads.feature_type = ['zip_code']
         >>> zipcode.ads.feature_domain()
         constraints: []

ads/feature_engineering/utils.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -11,18 +10,21 @@ Functions:
     is_boolean(value: Any) -> bool
         Checks if value type is boolean.
 """
-import numpy as np
+
+import re
+from functools import lru_cache
+from typing import Any
+
 import matplotlib.pyplot as plt
+import numpy as np
 import pandas as pd
-import re
+
 from ads.common.card_identifier import card_identify
 from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
     OptionalDependency,
+    runtime_dependency,
 )
 from ads.feature_engineering.dataset.zip_code_data import zip_code_dict
-from functools import lru_cache
-from typing import Any
 
 
 class SchemeNeutral(str):
@@ -67,7 +69,7 @@ def _add_missing(x, df):
     """
     Adds count of missing values.
     """
-    n_missing = pd.isnull(x.replace(r"", np.NaN)).sum()
+    n_missing = pd.isnull(x.replace(r"", np.nan)).sum()
     if n_missing > 0:
         df.loc["missing"] = n_missing
     return df
@@ -78,7 +80,7 @@ def _count_unique_missing(x):
     Returns the total count, unique count and count of missing values of a series.
     """
     df_stat = pd.Series(
-        {"count": len(x), "unique": len(x.replace(r"", np.NaN).dropna().unique())},
+        {"count": len(x), "unique": len(x.replace(r"", np.nan).dropna().unique())},
         name=x.name,
     ).to_frame()
     return _add_missing(x, df_stat)
@@ -122,7 +124,7 @@ def random_color_func(
     h = 179
     s = 23
     l = int(100.0 * float(random_state.randint(60, 120)) / 255.0)
-    return "hsl({}, {}%, {}%)".format(h, s, l)
+    return f"hsl({h}, {s}%, {l}%)"
 
 
 def _is_float(s: str):
@@ -135,7 +137,7 @@ def _is_float(s: str):
 def _str_lat_long_to_point(s):
     """
     Converts input data into formated geometry point
-    Return formated geometry point string or np.NaN if input string is not valid
+    Return formated geometry point string or np.nan if input string is not valid
     """
     if isinstance(s, str):
         coords = s.split(",")
@@ -147,7 +149,7 @@ def _str_lat_long_to_point(s):
                 long = long[:-1]
             if _is_float(lat) and _is_float(long):
                 return "POINT(" + long + " " + lat + ")"
-    return np.NaN
+    return np.nan
 
 
 @runtime_dependency(module="geopandas", install_from=OptionalDependency.GEO)

ads/model/transformer/onnx_transformer.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import json
@@ -16,7 +15,7 @@ pd.options.mode.chained_assignment = None
 
 # Note to developers: If you make any changes to this class, copy and paste those changes over to
 # templates/score_onnx.jinja2 and templates/score_onnx_new.jinja2. We do not yet have an automatic way of doing this.
-class ONNXTransformer(object):
+class ONNXTransformer:
     """
     This is a transformer to convert X [pandas.Dataframe, pd.Series] data into Onnx
     readable dtypes and formats. It is Serializable, so it can be reloaded at another time.
@@ -199,7 +198,7 @@ class ONNXTransformer(object):
                 X, impute_values=impute_values
             )
         elif isinstance(X, pd.Series):
-            X = X.replace(r"^\s*$", np.NaN, regex=True)
+            X = X.replace(r"^\s*$", np.nan, regex=True)
             if len(impute_values.keys()) == 1:
                 for key, val in impute_values.items():
                     X = X.fillna(val)
@@ -208,7 +207,7 @@ class ONNXTransformer(object):
                     "Multiple imputed values are provided, but `X` has only one dim."
                 )
         else:
-            raise NotImplemented(
+            raise NotImplementedError(
                 f"{type(X)} is not supported. Convert `X` to pandas dataframe or numpy array."
             )
         return X
@@ -218,11 +217,11 @@ class ONNXTransformer(object):
         for idx, val in impute_values.items():
             if isinstance(idx, int):
                 X.iloc[:, idx] = (
-                    X.iloc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.iloc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
             else:
                 X.loc[:, idx] = (
-                    X.loc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.loc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
         return X
 
@@ -294,7 +293,7 @@ class ONNXTransformer(object):
             The loaded model
         """
         # Make sure you have  pandas, numpy, and sklearn imported
-        with open(filename, "r") as f:
+        with open(filename) as f:
             export_dict = json.load(f)
 
         onnx_transformer = ONNXTransformer()

ads/templates/score.jinja2

@@ -207,7 +207,7 @@ class ONNXTransformer(object):
                 X, impute_values=impute_values
             )
         elif isinstance(X, pd.Series):
-            X = X.replace(r"^\s*$", np.NaN, regex=True)
+            X = X.replace(r"^\s*$", np.nan, regex=True)
             if len(impute_values.keys()) == 1:
                 for key, val in impute_values.items():
                     X = X.fillna(val)
@@ -226,11 +226,11 @@ class ONNXTransformer(object):
         for idx, val in impute_values.items():
             if isinstance(idx, int):
                 X.iloc[:, idx] = (
-                    X.iloc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.iloc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
             else:
                 X.loc[:, idx] = (
-                    X.loc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.loc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
         return X
 

ads/templates/score_onnx.jinja2

@@ -282,7 +282,7 @@ class ONNXTransformer(object):
                 X, impute_values=impute_values
             )
         elif isinstance(X, pd.Series):
-            X = X.replace(r"^\s*$", np.NaN, regex=True)
+            X = X.replace(r"^\s*$", np.nan, regex=True)
             if len(impute_values.keys()) == 1:
                 for key, val in impute_values.items():
                     X = X.fillna(val)
@@ -301,11 +301,11 @@ class ONNXTransformer(object):
         for idx, val in impute_values.items():
             if isinstance(idx, int):
                 X.iloc[:, idx] = (
-                    X.iloc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.iloc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
             else:
                 X.loc[:, idx] = (
-                    X.loc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.loc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
         return X
 

ads/templates/score_onnx_new.jinja2

@@ -348,7 +348,7 @@ class ONNXTransformer(object):
                 X, impute_values=impute_values
             )
         elif isinstance(X, pd.Series):
-            X = X.replace(r"^\s*$", np.NaN, regex=True)
+            X = X.replace(r"^\s*$", np.nan, regex=True)
             if len(impute_values.keys()) == 1:
                 for key, val in impute_values.items():
                     X = X.fillna(val)
@@ -367,11 +367,11 @@ class ONNXTransformer(object):
         for idx, val in impute_values.items():
             if isinstance(idx, int):
                 X.iloc[:, idx] = (
-                    X.iloc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.iloc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
             else:
                 X.loc[:, idx] = (
-                    X.loc[:, idx].replace(r"^\s*$", np.NaN, regex=True).fillna(val)
+                    X.loc[:, idx].replace(r"^\s*$", np.nan, regex=True).fillna(val)
                 )
         return X
 

{oracle_ads-2.13.13.dist-info → oracle_ads-2.13.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.13
+Version: 2.13.15
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle,GenAI,Generative AI,Forecast,Anomaly,Document Understanding,Anomaly Detection
 Author: Oracle Data Science
@@ -22,15 +22,15 @@ Requires-Dist: cloudpickle>=1.6.0
 Requires-Dist: fsspec>=0.8.7
 Requires-Dist: gitpython>=3.1.2
 Requires-Dist: jinja2>=2.11.2
-Requires-Dist: matplotlib>=3.1.3,<=3.8.4
-Requires-Dist: numpy>=1.19.2,<2.0.0
+Requires-Dist: matplotlib>=3.1.3
+Requires-Dist: numpy>=1.19.2
 Requires-Dist: oci>=2.148.0
 Requires-Dist: ocifs>=1.1.3
 Requires-Dist: pandas>=2.2.0
 Requires-Dist: psutil>=5.7.2
 Requires-Dist: python_jsonschema_objects>=0.3.13
 Requires-Dist: requests
-Requires-Dist: scikit-learn>=1.0,<1.6.0
+Requires-Dist: scikit-learn>=1.0
 Requires-Dist: tabulate>=0.8.9
 Requires-Dist: tqdm>=4.59.0
 Requires-Dist: pydantic>=2.6.3
@@ -56,6 +56,7 @@ Requires-Dist: ibis-framework[impala] ; extra == "bds"
 Requires-Dist: sqlalchemy ; extra == "bds"
 Requires-Dist: lightgbm ; extra == "boosted"
 Requires-Dist: xgboost ; extra == "boosted"
+Requires-Dist: scikit-learn>=1.0,<1.6.0 ; extra == "boosted"
 Requires-Dist: datefinder>=0.7.1 ; extra == "data"
 Requires-Dist: fastavro>=0.24.2 ; extra == "data"
 Requires-Dist: htmllistparse>=0.6.0 ; extra == "data"
@@ -98,6 +99,7 @@ Requires-Dist: pydantic>=2,<3 ; extra == "llm"
 Requires-Dist: evaluate>=0.4.0 ; extra == "llm"
 Requires-Dist: ipython>=7.23.1, <8.0 ; extra == "notebook"
 Requires-Dist: ipywidgets~=7.6.3 ; extra == "notebook"
+Requires-Dist: scikit-learn>=1.0,<1.6.0 ; extra == "notebook"
 Requires-Dist: lightgbm ; extra == "onnx"
 Requires-Dist: onnx>=1.12.0,<=1.15.0 ; extra == "onnx" and ( python_version < '3.12')
 Requires-Dist: onnx~=1.17.0 ; extra == "onnx" and ( python_version >= '3.12')
@@ -110,6 +112,7 @@ Requires-Dist: skl2onnx>=1.10.4 ; extra == "onnx" and ( python_version < '3.12')
 Requires-Dist: skl2onnx~=1.18.0 ; extra == "onnx" and ( python_version >= '3.12')
 Requires-Dist: tf2onnx ; extra == "onnx"
 Requires-Dist: xgboost<=1.7 ; extra == "onnx"
+Requires-Dist: scikit-learn>=1.0,<1.6.0 ; extra == "onnx"
 Requires-Dist: conda-pack ; extra == "opctl"
 Requires-Dist: docker ; extra == "opctl"
 Requires-Dist: inflection ; extra == "opctl"