prophecy-libs 2.0.0.dev4__tar.gz → 2.0.0.dev6__tar.gz

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: prophecy-libs
-Version: 2.0.0.dev4
+Version: 2.0.0.dev6
 Summary: Helper library for prophecy generated code
 Home-page: https://github.com/SimpleDataLabsInc/prophecy-python-libs
 Author: UNKNOWN

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/prophecy/jsonrpc/models.py

@@ -98,7 +98,10 @@ class RequestMethod(BaseRpcMethod):
 class NotificationMethod(BaseRpcMethod):
     """Base class for all notification methods."""
 
-    pass
+    def to_dict(self) -> Dict[str, Any]:
+        d = asdict(self)
+        d["type"] = self.__class__.__name__  # Play-JSON discriminator
+        return d
 
 
 class JsonRpcResult(ABC):

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/prophecy/utils/initial_python_code.py

@@ -7,16 +7,15 @@ from functools import wraps
 import logging
 import os
 import sys
+import re
 
-# Check if 'spark' is present in globals() or locals(), and is not None.
-# If not, attempt to initialize it using SparkSessionProxy for serverless
-if not globals().get("spark", None):
-    try:
-        from server_rest import SparkSessionProxy
-        spark = SparkSessionProxy.get_instance()
-    except Exception as e:
-        print(f"Failed to initialize 'spark' instance. Error: {e}")
-        raise Exception("Failed to initialize 'spark' instance")
+# Attempt to initialize it using SparkSessionProxy for serverless
+try:
+    from server_rest import SparkSessionProxy
+    spark = SparkSessionProxy.get_instance()
+except Exception as e:
+    print(f"Failed to initialize 'spark' instance. Error: {e}")
+    raise Exception("Failed to initialize 'spark' instance")
 
 # Monkey Patch Caching
 try:
@@ -311,6 +310,7 @@ from pyspark.sql.types import (
     DecimalType,
     DoubleType,
     IntegerType,
+    StructField,
 )
 from datetime import datetime, date, timedelta
 from decimal import Decimal
@@ -747,6 +747,26 @@ class DataSampleLoader:
         Lightweight replacement for Databricks' built-in ``display`` that returns the
         exact JSON payload your code receives through the DBX Commands API.
         """
+
+        
+
+        def to_ddl(dt: DataType) -> str:
+            _valid_ident = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
+            def quote_ident(name: str) -> str:
+                return name if _valid_ident.fullmatch(name) else f"`{name.replace('`', '``')}`"
+            
+            if isinstance(dt, ArrayType):
+                return f"array<{to_ddl(dt.elementType)}>"
+            if isinstance(dt, MapType):
+                return f"map<{to_ddl(dt.keyType)},{to_ddl(dt.valueType)}>"
+            if isinstance(dt, StructType):
+                inner = ",".join(
+                    f"{quote_ident(f.name)}:{to_ddl(f.dataType)}"
+                    for f in dt.fields
+                )
+                return f"struct<{inner}>"
+            return dt.simpleString()
+
         if df is None:
             return
 
@@ -755,8 +775,8 @@ class DataSampleLoader:
         schema: list[dict] = [
             {
                 "name": field.name,
-                "type": json.dumps(field.dataType.simpleString()),  # e.g. "\"long\""
-                "metadata": json.dumps(field.metadata or {}),  # e.g. "\"{}\""
+                "type": json.dumps(to_ddl(field.dataType)),
+                "metadata": json.dumps(field.metadata or {}),
             }
             for field in df.schema  # type: StructField
         ]
@@ -770,11 +790,14 @@ class DataSampleLoader:
         OUTPUT_FILE = "/tmp/display_output.json"
         if not Path(OUTPUT_FILE).exists():
             try:
+                serialized = cls._json_serialize(display_res)
+                if isinstance(serialized, bytes):
+                    serialized = serialized.decode("utf-8")
                 Path(OUTPUT_FILE).write_text(
-                    json.dumps(display_res, ensure_ascii=False), encoding="utf-8"
+                    serialized, encoding="utf-8"
                 )
                 logging.info(
-                    f"Successfully wrote display_res: {display_res} to {OUTPUT_FILE}"
+                    f"Successfully wrote display_res: {serialized} to {OUTPUT_FILE}"
                 )
             except Exception as e:
                 logging.error("Failed to write %s: %s", OUTPUT_FILE, e)

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/prophecy/utils/utils.py

@@ -1353,11 +1353,11 @@ class MetricsCollector:
             if is_serverless:
                 # making it falsely true for serverless case
                 cls.jvm_accessible = True
-                print(
+                logging.info(
                     f"Failed to initialize MetricsCollector, Spark context is not available, but still making cls.jvm_accessible = {cls.jvm_accessible}"
                 )
             else:
-                print(
+                logging.info(
                     "Failed to initialize MetricsCollector. Spark context is not available"
                 )
 
@@ -1548,7 +1548,7 @@ class MetricsCollector:
                     spark._jsparkSession, pipelineId, sessionForInteractive
                 )
         else:
-            print("Running pipeline without metrics")
+            logging.info("Running pipeline without metrics")
 
         if is_serverless:
             cls._handle_start_for_serverless(
@@ -1562,7 +1562,7 @@ class MetricsCollector:
                 spark._jsparkSession
             )
         else:
-            print("Finished pipeline without metrics")
+            logging.info("Finished pipeline without metrics")
         cls._handle_end_for_serverless(spark)
         global interimConfig
         interimConfig.clear()

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/prophecy_libs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: prophecy-libs
-Version: 2.0.0.dev4
+Version: 2.0.0.dev6
 Summary: Helper library for prophecy generated code
 Home-page: https://github.com/SimpleDataLabsInc/prophecy-python-libs
 Author: UNKNOWN

{prophecy-libs-2.0.0.dev4 → prophecy-libs-2.0.0.dev6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="prophecy-libs",
-    version="2.0.0.dev4",
+    version="2.0.0.dev6",
     url="https://github.com/SimpleDataLabsInc/prophecy-python-libs",
     packages=find_packages(exclude=["test.*", "test"]),
     description="Helper library for prophecy generated code",