fix #700 differently - bypass the restriction against python-native data types

Author: dimitri-yatsenko

datajoint/jobs.py

@@ -1,27 +1,14 @@
 from .hash import key_hash
 import os
 import platform
-import numpy as np
 from .table import Table
-from .errors import DuplicateError
 from .settings import config
-from .blob import MatStruct
+from .errors import DuplicateError
 
 ERROR_MESSAGE_LENGTH = 2047
 TRUNCATION_APPENDIX = '...truncated'
 
 
-def _adapt_key_to_matstruct(key):
-    """
-    Only used as a temporary measure for uninterrupted interoperability with datajoint 0.11.
-    Will be deprecated in datajoint 0.13 when support for native python data types is accepted.
-    :param key: a dict representing the primary key
-    :return: converted to dj.blob.MatStruct
-    """
-    return (key if config.get('enable_python_native_blobs')
-            else np.reshape(np.rec.array((list(key.values())), names=list(key)), (1, 1)).view(MatStruct))
-
-
 class JobTable(Table):
     """
     A base relation with no definition. Allows reserving jobs
@@ -87,10 +74,11 @@ def reserve(self, table_name, key):
             host=platform.node(),
             pid=os.getpid(),
             connection_id=self.connection.connection_id,
-            key=_adapt_key_to_matstruct(key),
+            key=key,
             user=self._user)
         try:
-            self.insert1(job, ignore_extra_fields=True)
+            with config(enable_pyton_native_blobs=True):
+                self.insert1(job, ignore_extra_fields=True)
         except DuplicateError:
             return False
         return True
@@ -115,16 +103,17 @@ def error(self, table_name, key, error_message, error_stack=None):
         """
         if len(error_message) > ERROR_MESSAGE_LENGTH:
             error_message = error_message[:ERROR_MESSAGE_LENGTH-len(TRUNCATION_APPENDIX)] + TRUNCATION_APPENDIX
-        self.insert1(
-            dict(
-                table_name=table_name,
-                key_hash=key_hash(key),
-                status="error",
-                host=platform.node(),
-                pid=os.getpid(),
-                connection_id=self.connection.connection_id,
-                user=self._user,
-                key=_adapt_key_to_matstruct(key),
-                error_message=error_message,
-                error_stack=error_stack),
-            replace=True, ignore_extra_fields=True)
+        with config(enable_pyton_native_blobs=True):
+            self.insert1(
+                dict(
+                    table_name=table_name,
+                    key_hash=key_hash(key),
+                    status="error",
+                    host=platform.node(),
+                    pid=os.getpid(),
+                    connection_id=self.connection.connection_id,
+                    user=self._user,
+                    key=key,
+                    error_message=error_message,
+                    error_stack=error_stack),
+                replace=True, ignore_extra_fields=True)