Fix json_native on Component.export

Author: blythed

CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optimize performance during apply.
 - Add option of multiple `VectorIndex` implementations
 - Batch create tables, put-components
+- Add fix for exporting component with `CFG.json_native=True`
 
 #### New Features & Functionality
 

superduper/__init__.py

@@ -7,6 +7,7 @@
 
 logging = logger.Logging
 
+import typing as t
 from importlib import metadata
 
 try:
@@ -16,6 +17,7 @@
     __version__ = "dev"
 
 
+from .base.base import Base
 from .base.datatype import BaseDataType, dill_serializer, pickle_serializer
 from .base.document import Document
 from .base.schema import Schema
@@ -74,4 +76,6 @@
     'pickle_serializer',
     'dill_serializer',
     'Streamlit',
+    'Base',
+    't',
 )

superduper/base/encoding.py

@@ -1,6 +1,8 @@
 import typing as t
 from dataclasses import dataclass, field
 
+from superduper.base.config import Config
+
 if t.TYPE_CHECKING:
     from superduper.base.base import Base
     from superduper.base.datalayer import Datalayer
@@ -19,6 +21,7 @@ class EncodeContext:
     :param leaves_to_keep: A sequence of Base instances to keep.
     :param metadata: Whether to include metadata.
     :param defaults: Whether to include defaults.
+    :param cfg: Configuration object.
     """
 
     name: str = '__main__'
@@ -29,6 +32,7 @@ class EncodeContext:
     leaves_to_keep: t.Sequence['Base'] = field(default_factory=tuple)
     metadata: bool = True
     defaults: bool = True
+    cfg: t.Optional[Config] = None
 
     def __call__(self, name: str):
         return EncodeContext(
@@ -40,4 +44,5 @@ def __call__(self, name: str):
             leaves_to_keep=self.leaves_to_keep,
             metadata=self.metadata,
             defaults=self.defaults,
+            cfg=self.cfg,
         )

superduper/base/schema.py

@@ -208,8 +208,12 @@ def encode_data(self, out, context: t.Optional[EncodeContext] = None, **kwargs):
                 )
                 raise e
 
-            if field.dtype == 'json' and not CFG.json_native:
-                encoded = json.dumps(encoded)
+            if field.dtype == 'json':
+                if context.cfg is not None:
+                    if not context.cfg.json_native:
+                        encoded = json.dumps(encoded)
+                elif not CFG.json_native:
+                    encoded = json.dumps(encoded)
 
             result[k] = encoded
 

superduper/components/component.py

@@ -589,7 +589,9 @@ def export(
 
         # r = self.dict(defaults=defaults, metadata=metadata)
         # r = r.encode(defaults=defaults, metadata=metadata)
-        r = self.encode(defaults=defaults, metadata=metadata)
+        from superduper import CFG
+
+        r = self.encode(defaults=defaults, metadata=metadata, cfg=CFG(json_native=True))
 
         def rewrite_keys(r, keys):
             if isinstance(r, dict):

superduper/components/template.py

@@ -86,7 +86,9 @@ def change_dir(destination):
     def postinit(self):
         """Post initialization method."""
         if isinstance(self.template, Base):
-            self.template = self.template.encode(defaults=True, metadata=False)
+            self.template = self.template.encode(
+                defaults=True, metadata=False, cfg=CFG(json_native=True)
+            )
 
         if '_blobs' in self.template:
             self.blobs = self.template.pop('_blobs')