convert Paths to str; expose LD_CONTEXT

antelope_core/archives/__init__.py

@@ -1,7 +1,7 @@
 from antelope import NoReference, EntityNotFound
 
 from .entity_store import EntityStore, EntityExists, uuid_regex
-from .basic_archive import BasicArchive, BASIC_ENTITY_TYPES, InterfaceError, ArchiveError
+from .basic_archive import BasicArchive, BASIC_ENTITY_TYPES, InterfaceError, ArchiveError, LD_CONTEXT
 from .archive_index import index_archive, BasicIndex, LcIndex
 from .term_manager import TermManager
 from .lc_archive import LcArchive, LC_ENTITY_TYPES

antelope_core/archives/basic_archive.py

@@ -12,7 +12,6 @@
 from ..from_json import from_json, to_json
 
 
-
 class OldJson(Exception):
     pass
 
@@ -396,7 +395,7 @@ def load_from_dict(self, j, _check=True, jsonfile=None):
         if 'flows' in j:
             for e in j['flows']:
                 e['entityType'] = 'flow'
-                self.entity_from_json(e)
+                self.entity_from_json(e)  # do we need to catch EntityNotFound?
 
         if 'loaded' in j:
             self._loaded = j['loaded']
@@ -489,6 +488,8 @@ def _serialize_quantities(self, domesticate=False):
 
     def serialize(self, characterizations=False, values=False, domesticate=False):
         """
+        Serialize flows and quantities.  If characterizations==True, also save Term Manager content
+        (characterizations, contexts, flowables)
 
         :param characterizations:
         :param values:

antelope_core/entities/entities.py

@@ -242,6 +242,13 @@ def _print_ref_field(self):
             return '%s' % self.reference_entity.external_ref
 
     def serialize(self, domesticate=False, drop_fields=()):
+        """
+        'domesticate=True' causes the entity to be saved without its origin, allowing it to take on the local origin
+        whenever it is loaded.
+        :param domesticate: [False] if True, drop origin.
+        :param drop_fields: fields to ignore from serialization
+        :return:
+        """
         j = {
             'entityType': self.entity_type,
             'externalId': self.external_ref,
@@ -300,9 +307,7 @@ def __setitem__(self, key, value):
             self._d[key] = value
 
     def merge(self, other):
-        if False:  # not isinstance(other, LcEntity):  ## This is not a requirement! cf. EntityRefs, Disclosure objs
-            raise EntityMergeError('Incoming is not an LcEntity: %s' % other)
-        elif self.entity_type != other.entity_type:
+        if self.entity_type != other.entity_type:
             raise EntityMergeError('Incoming entity type %s mismatch with %s' % (other.entity_type, self.entity_type))
         elif self.external_ref != other.external_ref:
             raise EntityMergeError('Incoming External ref %s conflicts with existing %s' % (other.external_ref,

antelope_core/lc_resource.py

@@ -332,7 +332,7 @@ def origin(self):
 
     @property
     def source(self):
-        return self._source
+        return str(self._source)
 
     @property
     def ds_type(self):