hana-ai 1.0.25100100__tar.gz → 1.0.25121700__tar.gz

{hana_ai-1.0.25100100/src/hana_ai.egg-info → hana_ai-1.0.25121700}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hana_ai
-Version: 1.0.25100100
+Version: 1.0.25121700
 Summary: Generative AI Toolkit for SAP HANA Cloud
 Author: SAP
 License: Apache-2.0
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: langchain
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: hana-ml>=2.25.25062301
+Requires-Dist: hana-ml>=2.26.25101500
 Requires-Dist: langchain-community
 Requires-Dist: langchain-core
 Requires-Dist: langchain-experimental

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hana_ai"
-version = "1.0.25100100"
+version = "1.0.25121700"
 authors = [
     {name = "SAP"}
 ]

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/requirements.txt

@@ -1,7 +1,7 @@
 langchain
 numpy
 pandas
-hana-ml>=2.25.25062301
+hana-ml>=2.26.25101500
 langchain-community
 langchain-core
 langchain-experimental

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai/__init__.py

@@ -2,4 +2,4 @@
 hana_ai is a Python package for AI/ML related utilities.
 """
 
-__version__ = "1.0.25100100"
+__version__ = "1.0.25121700"

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai/tools/hana_ml_tools/additive_model_forecast_tools.py

@@ -414,13 +414,13 @@ class AdditiveModelForecastLoadModelAndPredict(BaseTool):
             predicted_results = [f"PREDICT_RESULT_{predict_schema}_{predict_table}_{name}_{version}"]
         else:
             predicted_results = [f"PREDICT_RESULT_{predict_table}_{name}_{version}"]
-        self.connection_context.table(model._predict_output_table_names[0]).save(predicted_results[0])
+        self.connection_context.table(model._predict_output_table_names[0]).smart_save(predicted_results[0], force=True)
         if show_explainer is True:
             predicted_results.append(
                 f"REASON_CODE_{predict_schema}_{predict_table}_{name}_{version}" if predict_schema else
                 f"REASON_CODE_{predict_table}_{name}_{version}"
             )
-            self.connection_context.table(model._predict_output_table_names[1]).save(predicted_results[1])
+            self.connection_context.table(model._predict_output_table_names[1]).smart_save(predicted_results[1], force=True)
             return json.dumps({"predicted_results_table": predicted_results[0], "decomposed_and_reason_code_table": predicted_results[1]})
         return json.dumps({"predicted_results_table": predicted_results[0]}, cls=_CustomEncoder)
 

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai/tools/hana_ml_tools/automatic_timeseries_tools.py

@@ -421,7 +421,7 @@ class AutomaticTimeSeriesLoadModelAndPredict(BaseTool):
                       show_explainer=show_explainer)
         ms.save_model(model=model, if_exists='replace_meta')
         predicted_results = f"PREDICT_RESULT_{predict_table}_{name}_{version}" if predict_schema is None else f"PREDICT_RESULT_{predict_schema}_{predict_table}_{name}_{version}"
-        self.connection_context.table(model._predict_output_table_names[0]).save(predicted_results, force=True)
+        self.connection_context.table(model._predict_output_table_names[0]).smart_save(predicted_results, force=True)
         stats = self.connection_context.table(model._predict_output_table_names[1]).collect()
         outputs = {"predicted_results_table": predicted_results}
         for _, row in stats.iterrows():

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai/tools/hana_ml_tools/cap_artifacts_tools.py

@@ -7,7 +7,6 @@ The following class is available:
 """
 
 #pylint: disable=too-many-function-args
-
 import json
 import logging
 import os
@@ -36,6 +35,11 @@ class CAPArtifactsInput(BaseModel):
     cds_gen: Optional[bool] = Field(description="whether to generate CDS files for CAP project, it is optional", default=None)
     tudf: Optional[bool] = Field(description="whether to generate table UDF for CAP project, it is optional", default=None)
     archive: Optional[bool] = Field(description="whether to archive the generated artifacts, it is optional", default=None)
+    cons_fit_proc_name: Optional[str] = Field(description="The name of the consumption layer fit procedure defined in the CAP artifacts, it is optional", default=None)
+    cons_predict_proc_name: Optional[str] = Field(description="The name of the consumption layer predict procedure defined in the CAP artifacts, it is optional", default=None)
+    cons_score_proc_name: Optional[str] = Field(description="The name of the consumption layer score procedure defined in the CAP artifacts, it is optional", default=None)
+    apply_func_name: Optional[str] = Field(description="The name of the apply function for prediction defined in the CAP artifacts, it is optional", default=None)
+    new_model_name: Optional[str] = Field(description="The new model name defined in the CAP artifacts, it is optional", default=None)
 
 class CAPArtifactsForBASInput(BaseModel):
     """
@@ -46,7 +50,11 @@ class CAPArtifactsForBASInput(BaseModel):
     cds_gen: Optional[bool] = Field(description="whether to generate CDS files for CAP project, it is optional", default=None)
     tudf: Optional[bool] = Field(description="whether to generate table UDF for CAP project, it is optional", default=None)
     archive: Optional[bool] = Field(description="whether to archive the generated artifacts, it is optional", default=None)
-
+    cons_fit_proc_name: Optional[str] = Field(description="The name of the consumption layer fit procedure defined in the CAP artifacts, it is optional", default=None)
+    cons_predict_proc_name: Optional[str] = Field(description="The name of the consumption layer predict procedure defined in the CAP artifacts, it is optional", default=None)
+    cons_score_proc_name: Optional[str] = Field(description="The name of the consumption layer score procedure defined in the CAP artifacts, it is optional", default=None)
+    apply_func_name: Optional[str] = Field(description="The name of the apply function for prediction defined in the CAP artifacts, it is optional", default=None)
+    new_model_name: Optional[str] = Field(description="The new model name defined in the CAP artifacts, it is optional", default=None)
 
 class CAPArtifactsTool(BaseTool):
     """
@@ -88,6 +96,16 @@ class CAPArtifactsTool(BaseTool):
                   - Whether to generate table UDF for CAP project, it is optional.
                 * - archive
                   - Whether to archive the generated artifacts, it is optional.
+                * - cons_fit_proc_name
+                  - The name of the consumption layer fit procedure defined in the CAP artifacts, it is optional.
+                * - cons_predict_proc_name
+                  - The name of the consumption layer predict procedure defined in the CAP artifacts, it is optional.
+                * - cons_score_proc_name
+                  - The name of the consumption layer score procedure defined in the CAP artifacts, it is optional.
+                * - apply_func_name
+                  - The name of the apply function for prediction defined in the CAP artifacts, it is optional.
+                * - new_model_name
+                  - The new model name defined in the CAP artifacts, it is optional.
     """
     name: str = "cap_artifacts"
     """Name of the tool."""
@@ -132,6 +150,11 @@ class CAPArtifactsTool(BaseTool):
         cds_gen = kwargs.get("cds_gen", False)
         tudf = kwargs.get("tudf", False)
         archive = kwargs.get("archive", False)
+        cons_fit_proc_name = kwargs.get("cons_fit_proc_name", None)
+        cons_predict_proc_name = kwargs.get("cons_predict_proc_name", None)
+        cons_score_proc_name = kwargs.get("cons_score_proc_name", None)
+        apply_func_name = kwargs.get("apply_func_name", None)
+        new_model_name = kwargs.get("new_model_name", None)
         ms = ModelStorage(connection_context=self.connection_context)
         model = ms.load_model(name, version)
 
@@ -140,6 +163,14 @@ class CAPArtifactsTool(BaseTool):
             output_dir=output_dir,
             namespace=namespace
         )
+        if hasattr(generator, "configure"):
+            generator.configure(
+              cons_fit_proc_name=cons_fit_proc_name,
+              cons_predict_proc_name=cons_predict_proc_name,
+              cons_score_proc_name=cons_score_proc_name,
+              apply_func_name=apply_func_name,
+              model_name=new_model_name
+            )
         generator.generate_artifacts(model, cds_gen=cds_gen, tudf=tudf, archive=archive)
         return "CAP artifacts generated successfully. Root directory: " + str(Path(os.path.join(generator.output_dir, generator.project_name)).as_posix())
 
@@ -185,6 +216,16 @@ class CAPArtifactsForBASTool(BaseTool):
                   - Whether to generate table UDF for CAP project, it is optional.
                 * - archive
                   - Whether to archive the generated artifacts, it is optional.
+                * - cons_fit_proc_name
+                  - The name of the consumption layer fit procedure defined in the CAP artifacts, it is optional.
+                * - cons_predict_proc_name
+                  - The name of the consumption layer predict procedure defined in the CAP artifacts it is optional.
+                * - cons_score_proc_name
+                  - The name of the consumption layer score procedure defined in the CAP artifacts, it is optional.
+                * - apply_func_name
+                  - The name of the apply function for prediction defined in the CAP artifacts, it is optional.
+                * - new_model_name
+                  - The new model name defined in the CAP artifacts, it is optional.
     """
     name: str = "cap_artifacts_for_bas"
     """Name of the tool."""
@@ -222,6 +263,11 @@ class CAPArtifactsForBASTool(BaseTool):
         cds_gen = kwargs.get("cds_gen", False)
         tudf = kwargs.get("tudf", False)
         archive = kwargs.get("archive", True)
+        cons_fit_proc_name = kwargs.get("cons_fit_proc_name", None)
+        cons_predict_proc_name = kwargs.get("cons_predict_proc_name", None)
+        cons_score_proc_name = kwargs.get("cons_score_proc_name", None)
+        apply_func_name = kwargs.get("apply_func_name", None)
+        new_model_name = kwargs.get("new_model_name", None)
         ms = ModelStorage(connection_context=self.connection_context)
         model = ms.load_model(name, version)
         # if archive is None:
@@ -233,6 +279,14 @@ class CAPArtifactsForBASTool(BaseTool):
             project_name="capproject",
             output_dir=output_dir
         )
+        if hasattr(generator, "configure"):
+            generator.configure(
+              cons_fit_proc_name=cons_fit_proc_name,
+              cons_predict_proc_name=cons_predict_proc_name,
+              cons_score_proc_name=cons_score_proc_name,
+              apply_func_name=apply_func_name,
+              model_name=new_model_name
+            )
         generator.generate_artifacts(model, cds_gen=cds_gen, tudf=tudf, archive=archive)
         return json.dumps({"generated_cap_project" : str(Path(os.path.join(generator.output_dir, generator.project_name)).as_posix())})
 

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai/tools/hana_ml_tools/massive_automatic_timeseries_tools.py

@@ -436,7 +436,7 @@ class MassiveAutomaticTimeSeriesLoadModelAndPredict(BaseTool):
                       show_explainer=show_explainer)
         ms.save_model(model=model, if_exists='replace_meta')
         predicted_results = f"PREDICT_RESULT_{predict_table}_{name}_{version}" if predict_schema is None else f"PREDICT_RESULT_{predict_schema}_{predict_table}_{name}_{version}"
-        self.connection_context.table(model._predict_output_table_names[0]).save(predicted_results, force=True)
+        self.connection_context.table(model._predict_output_table_names[0]).smart_save(predicted_results, force=True)
         stats = self.connection_context.table(model._predict_output_table_names[1]).collect()
         outputs = {"predicted_results_table": predicted_results}
         for _, row in stats.iterrows():

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700/src/hana_ai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hana_ai
-Version: 1.0.25100100
+Version: 1.0.25121700
 Summary: Generative AI Toolkit for SAP HANA Cloud
 Author: SAP
 License: Apache-2.0
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: langchain
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: hana-ml>=2.25.25062301
+Requires-Dist: hana-ml>=2.26.25101500
 Requires-Dist: langchain-community
 Requires-Dist: langchain-core
 Requires-Dist: langchain-experimental

{hana_ai-1.0.25100100 → hana_ai-1.0.25121700}/src/hana_ai.egg-info/requires.txt

@@ -1,7 +1,7 @@
 langchain
 numpy
 pandas
-hana-ml>=2.25.25062301
+hana-ml>=2.26.25101500
 langchain-community
 langchain-core
 langchain-experimental