relationalai 0.11.2__py3-none-any.whl → 0.11.4__py3-none-any.whl

relationalai/semantics/reasoners/optimization/solvers_pb.py

@@ -2,12 +2,15 @@ from __future__ import annotations
 from typing import Any, Union
 import textwrap
 import uuid
+import time
 
 from relationalai.semantics.metamodel.util import ordered_set
 from relationalai.semantics.internal import internal as b # TODO(coey) change b name or remove b.?
 from relationalai.semantics.rel.executor import RelExecutor
 from .common import make_name
 from relationalai.experimental.solvers import Solver
+from relationalai.tools.constants import DEFAULT_QUERY_TIMEOUT_MINS
+from relationalai.util.timeout import calc_remaining_timeout_minutes
 
 _Any = Union[b.Producer, str, float, int]
 _Number = Union[b.Producer, float, int]
@@ -222,6 +225,14 @@ class SolverModelPB:
         assert isinstance(executor, RelExecutor)
         prefix_l = f"solvermodel_{self._id}_"
 
+        query_timeout_mins = kwargs.get("query_timeout_mins", None)
+        config = self._model._config
+        if query_timeout_mins is None and (timeout_value := config.get("query_timeout_mins", DEFAULT_QUERY_TIMEOUT_MINS)) is not None:
+            query_timeout_mins = int(timeout_value)
+        config_file_path = getattr(config, 'file_path', None)
+        start_time = time.monotonic()
+        remaining_timeout_minutes = query_timeout_mins
+
         # 1. Materialize the model and store it.
         print("export model")
         b.select(b.count(self.Variable)).to_df() # TODO(coey) weird hack to avoid uninitialized properties error
@@ -244,14 +255,22 @@ class SolverModelPB:
         def config[:envelope, :payload, :data]: model_string
         def config[:envelope, :payload, :path]: "{model_uri}"
         def export {{ config }}
-        """))
+        """), query_timeout_mins=remaining_timeout_minutes)
 
         # 2. Execute job and wait for completion.
         print("execute solver job")
-        job_id = solver._exec_job(payload, log_to_console=log_to_console)
+        remaining_timeout_minutes = calc_remaining_timeout_minutes(
+            start_time, query_timeout_mins, config_file_path=config_file_path,
+        )
+        job_id = solver._exec_job(
+            payload, log_to_console=log_to_console, query_timeout_mins=remaining_timeout_minutes,
+        )
 
         # 3. Extract result.
         print("extract result")
+        remaining_timeout_minutes = calc_remaining_timeout_minutes(
+            start_time, query_timeout_mins, config_file_path=config_file_path,
+        )
         extract_str = textwrap.dedent(f"""
         def raw_result {{
             load_binary["snowflake://APP_STATE.RAI_INTERNAL_STAGE/job-results/{job_id}/result.binpb"]
@@ -289,7 +308,9 @@ class SolverModelPB:
                     ::std::mirror::convert(std::mirror::typeof[Int128], j, i)
                 )
             """)
-        executor.execute_raw(extract_str, readonly=False)
+        executor.execute_raw(
+            extract_str, readonly=False, query_timeout_mins=remaining_timeout_minutes,
+        )
 
         print("finished solve")
         return None

relationalai/semantics/rel/compiler.py

@@ -12,7 +12,7 @@ from relationalai.semantics.metamodel.visitor import ReadWriteVisitor
 from relationalai.semantics.metamodel.util import OrderedSet, group_by, NameCache, ordered_set
 
 from relationalai.semantics.rel import rel, rel_utils as u, builtins as rel_bt
-from relationalai.semantics.rel.rewrite import CDC, QuantifyVars
+from relationalai.semantics.rel.rewrite import CDC, QuantifyVars, ExtractCommon
 
 import math
 
@@ -32,7 +32,7 @@ class Compiler(c.Compiler):
             InferTypes(),
             DNFUnionSplitter(),
             ExtractKeys(),
-            # rewrite.ExtractCommon(),
+            ExtractCommon(),
             Flatten(),
             Splinter(),
             QuantifyVars(),
@@ -125,21 +125,6 @@ class ModelToRel:
                 tuple([rel.Annotation("inline", ())]),
             ))
 
-        if "pyrel_num_chars" in reads:
-            defs.append(
-                rel.Def("pyrel_num_chars",
-                    tuple([rel.Var("x"), rel.Var("y")]),
-                    rel.Exists(
-                        tuple([rel.Var("z")]),
-                        rel.And(ordered_set(
-                            rel.atom("::std::common::num_chars", tuple([rel.Var("x"), rel.Var("z")])),
-                            rel.Atom(self._convert_abs(types.Int64, types.Int128), tuple([rel.Var("z"), rel.Var("y")])),
-                        )),
-                    ),
-                    tuple([rel.Annotation("inline", ())]),
-                ),
-            )
-
         if "pyrel_count" in reads:
             defs.append(
                 rel.Def("pyrel_count",
@@ -249,6 +234,9 @@ class ModelToRel:
                     ),
             )
 
+        if "pyrel_regex_search" in reads:
+            raise NotImplementedError("pyrel_regex_search is not implemented")
+
         return defs
 
     @staticmethod

relationalai/semantics/rel/executor.py

@@ -305,8 +305,8 @@ class RelExecutor(e.Executor):
 
     # NOTE(coey): this is added temporarily to support executing Rel for the solvers library in EA.
     # It can be removed once this is no longer needed by the solvers library.
-    def execute_raw(self, raw_rel:str, readonly:bool=True) -> DataFrame:
-        raw_results = self.resources.exec_raw(self.database, self.engine, raw_rel, readonly, nowait_durable=True)
+    def execute_raw(self, raw_rel:str, readonly:bool=True, query_timeout_mins:int|None=None) -> DataFrame:
+        raw_results = self.resources.exec_raw(self.database, self.engine, raw_rel, readonly, nowait_durable=True, query_timeout_mins=query_timeout_mins)
         df, errs = result_helpers.format_results(raw_results, None, generation=Generation.QB)  # Pass None for task parameter
         self.report_errors(errs)
         return df

relationalai/semantics/rel/rel.py

@@ -223,6 +223,12 @@ class Printer(BasePrinter):
             self._print("::std::common::int[128,")
             self._print(str(value))
             self._print("]")
+        elif isinstance(value, datetime):
+            if value.tzinfo is None:
+                value = value.replace(tzinfo=timezone.utc)
+            self._print(value.astimezone(timezone.utc).isoformat())
+        elif isinstance(value, date):
+            self._print(value.isoformat())
         else:
             self._print(str(value))
 

relationalai/semantics/rel/rel_utils.py

@@ -38,25 +38,43 @@ OPERATORS = {
     "range": "::std::common::range",
     "hash": "rel_primitive_hash_tuple_uint128",
     "uuid_to_string": "::std::common::uuid_string",
+    "parse_uuid": "::std::common::parse_uuid",
 
     # dates
     "date_year": "::std::common::date_year",
+    "date_quarter": "::std::common::date_quarterofyear",
     "date_month": "::std::common::date_month",
     "date_week": "::std::common::date_week",
     "date_day": "::std::common::date_day",
+    "date_dayofyear": "::std::common::date_dayofyear",
+    "date_weekday": "::std::common::date_dayofweek",
     "date_add": "::std::common::date_add",
     "date_subtract": "::std::common::date_subtract",
     "dates_period_days": "pyrel_dates_period_days",
     "datetimes_period_milliseconds": "pyrel_datetimes_period_milliseconds",
     "datetime_add": "::std::common::datetime_add",
+    "datetime_year": "::std::common::datetime_year",
+    "datetime_quarter": "::std::common::datetime_quarterofyear",
+    "datetime_month": "::std::common::datetime_month",
     "datetime_week": "::std::common::datetime_week",
+    "datetime_day": "::std::common::datetime_day",
+    "datetime_dayofyear": "::std::common::datetime_dayofyear",
+    "datetime_hour": "::std::common::datetime_hour",
+    "datetime_minute": "::std::common::datetime_minute",
+    "datetime_second": "::std::common::datetime_second",
+    "datetime_weekday": "::std::common::datetime_dayofweek",
     "datetime_subtract": "::std::common::datetime_subtract",
     "construct_datetime_ms_tz": "::std::common::^DateTime",
     "date_format": "::std::common::format_date",
     "datetime_format": "::std::common::format_datetime",
     "construct_date_from_datetime": "::std::common::^Date",
+    "construct_date": "::std::common::^Date",
+    "parse_date": "rel_primitive_parse_date",
+    "parse_datetime": "rel_primitive_parse_datetime",
 
     # periods
+    "nanosecond": "::std::common::^Nanosecond",
+    "microsecond": "::std::common::^Microsecond",
     "millisecond": "::std::common::^Millisecond",
     "second": "::std::common::^Second",
     "minute": "::std::common::^Minute",
@@ -69,6 +87,8 @@ OPERATORS = {
     # math
     "abs": "::std::common::abs",
     "natural_log": "::std::common::natural_log",
+    "log": "::std::common::log",
+    "log10": "::std::common::log10",
     "sqrt": "std::common::sqrt",
     "maximum": "::std::common::maximum",
     "minimum": "::std::common::minimum",
@@ -88,6 +108,15 @@ OPERATORS = {
     "sinh": "rel_primitive_sinh",
     "asin": "rel_primitive_asin",
     "asinh": "rel_primitive_asinh",
+    "tan": "rel_primitive_tan",
+    "tanh": "rel_primitive_tanh",
+    "atan": "rel_primitive_atan",
+    "atanh": "rel_primitive_atanh",
+    "cot": "rel_primitive_cot",
+    "acot": "rel_primitive_acot",
+    "exp": "rel_primitive_natural_exp",
+    "erf": "rel_primitive_error_function",
+    "erfinv": "rel_primitive_error_function_inverse",
 
     # strings
     "string": "::std::common::string",
@@ -96,7 +125,7 @@ OPERATORS = {
     "ends_with": "::std::common::ends_with",
     "contains": "::std::common::contains",
     "substring": "::std::common::substring",
-    "num_chars": "pyrel_num_chars",
+    "num_chars": "::std::common::num_chars",
     "like_match": "::std::common::like_match",
     "lower": "::std::common::lowercase",
     "upper": "::std::common::uppercase",
@@ -105,7 +134,14 @@ OPERATORS = {
     "replace": "rel_primitive_replace",
     "split": "::std::common::string_split",
     "split_part": "::std::common::string_split",
+
+    # regex
     "regex_match": "rel_primitive_regex_match",
+    "regex_match_all": "::std::common::regex_match_all",
+    "regex_search": "pyrel_regex_search",
+    "capture_group_by_index": "::std::common::capture_group_by_index",
+    "capture_group_by_name": "::std::common::capture_group_by_name",
+    "escape_regex_metachars": "::std::common::escape_regex_metachars",
 
     # ints
     "parse_int64": "::std::common::parse_int",