oracle-ads 2.11.13__tar.gz → 2.11.14__tar.gz

{oracle_ads-2.11.13 → oracle_ads-2.11.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.13
+Version: 2.11.14
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science
@@ -13,6 +13,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: PyYAML>=6
 Requires-Dist: asteval>=0.9.25
 Requires-Dist: cerberus>=1.3.4
@@ -20,8 +21,8 @@ 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,<=3.8.4
+Requires-Dist: numpy>=1.19.2,<2.0.0
 Requires-Dist: oci>=2.125.3
 Requires-Dist: ocifs>=1.1.3
 Requires-Dist: pandas>1.2.1; python_version<'3.9'
@@ -40,7 +41,7 @@ Requires-Dist: jupyter_server ; extra == "aqua"
 Requires-Dist: hdfs[kerberos] ; extra == "bds"
 Requires-Dist: ibis-framework[impala] ; extra == "bds"
 Requires-Dist: sqlalchemy ; extra == "bds"
-Requires-Dist: lightgbm<4.0.0 ; extra == "boosted"
+Requires-Dist: lightgbm ; extra == "boosted"
 Requires-Dist: xgboost ; extra == "boosted"
 Requires-Dist: datefinder>=0.7.1 ; extra == "data"
 Requires-Dist: fastavro>=0.24.2 ; extra == "data"
@@ -48,7 +49,7 @@ Requires-Dist: htmllistparse>=0.6.0 ; extra == "data"
 Requires-Dist: openpyxl>=3.0.7 ; extra == "data"
 Requires-Dist: oracledb>=1.0 ; extra == "data"
 Requires-Dist: pandavro>=1.6.0 ; extra == "data"
-Requires-Dist: sqlalchemy>=1.4.1, <=1.4.46 ; extra == "data"
+Requires-Dist: sqlalchemy>=1.4.1,<=1.4.46 ; extra == "data"
 Requires-Dist: oracle-ads[opctl] ; extra == "feature-store-marketplace"
 Requires-Dist: kubernetes ; extra == "feature-store-marketplace"
 Requires-Dist: conda-pack ; extra == "forecast"
@@ -73,20 +74,21 @@ Requires-Dist: statsmodels ; extra == "forecast"
 Requires-Dist: plotly ; extra == "forecast"
 Requires-Dist: oracledb ; extra == "forecast"
 Requires-Dist: report-creator==1.0.9 ; extra == "forecast"
-Requires-Dist: geopandas ; extra == "geo"
+Requires-Dist: geopandas<1.0.0 ; extra == "geo"
 Requires-Dist: oracle_ads[viz] ; extra == "geo"
 Requires-Dist: transformers ; extra == "huggingface"
+Requires-Dist: tf-keras ; extra == "huggingface"
 Requires-Dist: langchain-community<0.0.32 ; extra == "llm"
 Requires-Dist: langchain>=0.1.10,<0.1.14 ; 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: lightgbm<4.0.0 ; extra == "onnx"
-Requires-Dist: onnx>=1.12.0 ; extra == "onnx"
+Requires-Dist: lightgbm ; extra == "onnx"
+Requires-Dist: onnx>=1.12.0,<=1.15.0 ; extra == "onnx"
 Requires-Dist: onnxmltools>=1.10.0 ; extra == "onnx"
-Requires-Dist: onnxruntime>=1.10.0,<1.16 ; extra == "onnx"
+Requires-Dist: onnxruntime~=1.17.0,!=1.16.0 ; extra == "onnx"
 Requires-Dist: oracle_ads[viz] ; extra == "onnx"
-Requires-Dist: protobuf<=3.20 ; extra == "onnx"
+Requires-Dist: protobuf ; extra == "onnx"
 Requires-Dist: skl2onnx>=1.10.4 ; extra == "onnx"
 Requires-Dist: tf2onnx ; extra == "onnx"
 Requires-Dist: xgboost<=1.7 ; extra == "onnx"
@@ -114,14 +116,10 @@ Requires-Dist: spacy==3.6.1 ; extra == "pii"
 Requires-Dist: report-creator==1.0.9 ; extra == "pii"
 Requires-Dist: pyspark>=3.0.0 ; extra == "spark"
 Requires-Dist: oracle_ads[viz] ; extra == "tensorflow"
-Requires-Dist: tensorflow ; extra == "tensorflow"
-Requires-Dist: dask==2023.5.0 ; extra == "testsuite" and ( python_version=='3.8')
-Requires-Dist: dask==2023.10.1 ; extra == "testsuite" and ( python_version>='3.9')
+Requires-Dist: tensorflow<=2.15.1 ; extra == "tensorflow"
 Requires-Dist: arff ; extra == "testsuite"
 Requires-Dist: category_encoders==2.6.3 ; extra == "testsuite"
 Requires-Dist: cohere==4.53 ; extra == "testsuite"
-Requires-Dist: dask==2023.10.1 ; extra == "testsuite" and ( python_version>='3.9')
-Requires-Dist: dask==2023.5.0 ; extra == "testsuite" and ( python_version=='3.8')
 Requires-Dist: faiss-cpu ; extra == "testsuite"
 Requires-Dist: fastparquet==2024.2.0 ; extra == "testsuite"
 Requires-Dist: imbalanced-learn ; extra == "testsuite"
@@ -132,17 +130,18 @@ Requires-Dist: notebook==6.4.12 ; extra == "testsuite"
 Requires-Dist: opensearch-py ; extra == "testsuite"
 Requires-Dist: pdfplumber ; extra == "testsuite"
 Requires-Dist: py4j ; extra == "testsuite"
-Requires-Dist: pyarrow ; extra == "testsuite"
+Requires-Dist: pyarrow>=15.0.0 ; extra == "testsuite"
 Requires-Dist: statsmodels ; extra == "testsuite" and ( python_version=='3.8')
 Requires-Dist: statsmodels>=0.14.1 ; extra == "testsuite" and ( python_version>='3.9')
 Requires-Dist: tables ; extra == "testsuite"
+Requires-Dist: tables>3.9.0 ; extra == "testsuite" and ( python_version>='3.9')
 Requires-Dist: xlrd>=1.2.0 ; extra == "testsuite"
-Requires-Dist: spacy ; extra == "text"
+Requires-Dist: spacy>=3.4.2 ; extra == "text"
 Requires-Dist: wordcloud>=1.8.1 ; extra == "text"
 Requires-Dist: oracle_ads[viz] ; extra == "torch"
 Requires-Dist: torch ; extra == "torch"
 Requires-Dist: torchvision ; extra == "torch"
-Requires-Dist: bokeh>=3.0.0, <3.2.0 ; extra == "viz"
+Requires-Dist: bokeh>=3.0.0,<3.2.0 ; extra == "viz"
 Requires-Dist: folium>=0.12.1 ; extra == "viz"
 Requires-Dist: graphviz<0.17 ; extra == "viz"
 Requires-Dist: scipy>=1.5.4 ; extra == "viz"

{oracle_ads-2.11.13 → oracle_ads-2.11.14}/ads/common/oci_logging.py

@@ -614,13 +614,14 @@ class OCILog(OCILoggingModelMixin, oci.logging.models.Log):
             A list of log records.
             Each log record is a dictionary with the following keys: `id`, `time`, `message`.
         """
-        return self._search_and_format(
+        tail_logs = self._search_and_format(
             source=source,
             limit=limit,
-            sort_order=SortOrder.ASC,
+            sort_order=SortOrder.DESC,
             time_start=time_start,
             log_filter=log_filter,
         )
+        return sorted(tail_logs, key=lambda log: log["time"])
 
     def head(
         self,
@@ -854,14 +855,15 @@ class ConsolidatedLog:
             Expression for filtering the logs. This will be the WHERE clause of the query.
             Defaults to None.
         """
+        tail_logs = self._search_and_format(
+            source=source,
+            limit=limit,
+            sort_order=SortOrder.DESC,
+            time_start=time_start,
+            log_filter=log_filter,
+        )
         self._print(
-            self._search_and_format(
-                source=source,
-                limit=limit,
-                sort_order=SortOrder.ASC,
-                time_start=time_start,
-                log_filter=log_filter,
-            )
+            sorted(tail_logs, key=lambda log: log["time"])
         )
 
     def head(

{oracle_ads-2.11.13 → oracle_ads-2.11.14}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.11.13"
+version = "2.11.14"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"
@@ -48,6 +48,7 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
 ]
 
 # PEP 508 – Dependency specification for Python Software Packages - https://peps.python.org/pep-0508/
@@ -61,8 +62,8 @@ dependencies = [
   "fsspec>=0.8.7",
   "gitpython>=3.1.2",
   "jinja2>=2.11.2",
-  "matplotlib>=3.1.3, <=3.8.4",
-  "numpy>=1.19.2, <2.0.0",
+  "matplotlib>=3.1.3,<=3.8.4",
+  "numpy>=1.19.2,<2.0.0",
   "oci>=2.125.3",
   "ocifs>=1.1.3",
   "pandas>1.2.1; python_version<'3.9'", # starting pandas v2.1.0 requires-python = '>=3.9'
@@ -79,7 +80,7 @@ dependencies = [
 # Copied from extras_require list in setup.py, setup.py got removed in favor of this config file
 bds = ["hdfs[kerberos]", "ibis-framework[impala]", "sqlalchemy"]
 boosted = [
-  "lightgbm<4.0.0", # relax when the official releases of skl2onnx (v1.16.0) and onnxmltools (1.11.3), https://github.com/sdpython/mlprodict/issues/488
+  "lightgbm",
   "xgboost",
 ]
 data = [
@@ -89,18 +90,24 @@ data = [
   "openpyxl>=3.0.7",
   "oracledb>=1.0",
   "pandavro>=1.6.0",
-  "sqlalchemy>=1.4.1, <=1.4.46",
+  "sqlalchemy>=1.4.1,<=1.4.46",
+]
+geo = [
+  "geopandas<1.0.0",  # in v1.0.0 removed the built-in dataset 'naturalearth_lowres', fix when relax version of geopandas needed
+  "oracle_ads[viz]"
+]
+huggingface = [
+  "transformers",
+  "tf-keras"  # Keras 3 installed in py3.11+, but this is not yet supported in Transformers. Need to install the backwards-compatible tf-keras
 ]
-geo = ["geopandas", "oracle_ads[viz]"]
-huggingface = ["transformers"]
 notebook = ["ipython>=7.23.1, <8.0", "ipywidgets~=7.6.3"]
 onnx = [
-  "lightgbm<4.0.0",            # relax when the official releases of skl2onnx (v1.16.0) and onnxmltools (1.11.3), https://github.com/sdpython/mlprodict/issues/488
-  "onnx>=1.12.0",
+  "lightgbm",
+  "onnx>=1.12.0,<=1.15.0",  # v 1.15.0 set base on onnxrutime version and onnx opset support - https://onnxruntime.ai/docs/reference/compatibility.html#onnx-opset-support
   "onnxmltools>=1.10.0",
-  "onnxruntime>=1.10.0,<1.16", # v1.16 introduced issues https://github.com/microsoft/onnxruntime/issues/17631, revealed by unit tests
+  "onnxruntime~=1.17.0,!=1.16.0",  # v1.17.0 used in Oracle Database 23ai; avoid v1.16 https://github.com/microsoft/onnxruntime/issues/17631, revealed by unit tests
   "oracle_ads[viz]",
-  "protobuf<=3.20",
+  "protobuf",
   "skl2onnx>=1.10.4",
   "tf2onnx",
   "xgboost<=1.7",
@@ -119,11 +126,21 @@ opctl = [
 ]
 optuna = ["optuna==2.9.0", "oracle_ads[viz]"]
 spark = ["pyspark>=3.0.0"]
-tensorflow = ["oracle_ads[viz]", "tensorflow"]
-text = ["spacy", "wordcloud>=1.8.1"]
-torch = ["oracle_ads[viz]", "torch", "torchvision"]
+tensorflow = [
+  "oracle_ads[viz]",
+  "tensorflow<=2.15.1"  # v2.16.1 with consequence on tf2onnx v1.16.1 (latest) has an issue with Keras 3 installed in py3.11+ (https://github.com/onnx/tensorflow-onnx/issues/2319)
+]
+text = [
+  "spacy>=3.4.2",   # the first version of spacy that supports python 3.11 is spacy v3.4.2
+  "wordcloud>=1.8.1"
+]
+torch = [
+  "oracle_ads[viz]",
+  "torch",
+  "torchvision"
+]
 viz = [
-  "bokeh>=3.0.0, <3.2.0",  # starting 3.2.0 bokeh not supporting python3.8; relax after ADS will drop py3.8 support
+  "bokeh>=3.0.0,<3.2.0",  # starting 3.2.0 bokeh not supporting python3.8; relax after ADS will drop py3.8 support
   "folium>=0.12.1",
   "graphviz<0.17",
   "scipy>=1.5.4",
@@ -182,13 +199,9 @@ aqua = ["jupyter_server"]
 # trying to use. Ref - https://pip.pypa.io/en/stable/topics/dependency-resolution/#possible-ways-to-reduce-backtracking.
 # Revisit this section continuously and update to recent version of libraries. focus on pyt3.9/3.10 versions.
 testsuite = [
-  "dask==2023.5.0; python_version=='3.8'",
-  "dask==2023.10.1; python_version>='3.9'", # oci-cli depends on click==8.0.4, dask>2023.10.1 depends on "click>=8.1"
   "arff",
   "category_encoders==2.6.3",  # set version to avoid backtracking
   "cohere==4.53",  # set version to avoid backtracking
-  "dask==2023.10.1; python_version>='3.9'", # oci-cli depends on click==8.0.4, dask>2023.10.1 depends on "click>=8.1"
-  "dask==2023.5.0; python_version=='3.8'",
   "faiss-cpu",
   "fastparquet==2024.2.0",  # set version to avoid backtracking
   "imbalanced-learn",
@@ -199,10 +212,11 @@ testsuite = [
   "opensearch-py",
   "pdfplumber",
   "py4j",
-  "pyarrow",
+  "pyarrow>=15.0.0",
   "statsmodels; python_version=='3.8'",
   "statsmodels>=0.14.1; python_version>='3.9'",  # cython3.0 compatibility added in v0.14.1
   "tables",
+  "tables>3.9.0; python_version>='3.9'",
   "xlrd>=1.2.0",
 ]
 
@@ -221,3 +235,45 @@ name = "ads" # name for local build and import, see https://flit.pypa.io/en/late
 # By default `ads` folder and `LICENSE.txt` file included in sdist. Folders `docs` and `tests` are excluded, as weel as other project files
 # Use this section to include/exclude files and folders. See doc: https://flit.pypa.io/en/latest/pyproject_toml.html#sdist-section
 include = ["THIRD_PARTY_LICENSES.txt"]
+
+# Configuring Ruff (https://docs.astral.sh/ruff/configuration/)
+[tool.ruff]
+fix = true
+
+[tool.ruff.lint]
+exclude = ["*.yaml", "*jinja2"]
+# rules - https://docs.astral.sh/ruff/rules/
+extend-ignore = ["E402", "N806", "N803"]
+ignore = [
+  "S101",    # use of assert
+  "B008",    # function call in argument defaults
+  "B017",    # pytest.raises considered evil
+  "B023",    # function definition in loop (TODO: un-ignore this)
+  "B028",    # explicit stacklevel for warnings
+  "C901",    # function is too complex (TODO: un-ignore this)
+  "E501",    # from scripts/lint_backend.sh
+  "PLR091",  # complexity rules
+  "PLR2004", # magic numbers
+  "PLW2901", # `for` loop variable overwritten by assignment target
+  "SIM105",  # contextlib.suppress (has a performance cost)
+  "SIM117",  # multiple nested with blocks (doesn't look good with gr.Row etc)
+  "UP006",   # use `list` instead of `List` for type annotations (fails for 3.8)
+  "UP007",   # use X | Y for type annotations (TODO: can be enabled once Pydantic plays nice with them)
+]
+extend-select = [
+  "ARG",
+  "B",
+  "C",
+  "E",
+  "F",
+  "I",
+  "N",
+  "PL",
+  "S101",
+  "SIM",
+  "UP",
+  "W",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]