sdata 0.23.2__tar.gz → 0.23.3__tar.gz

{sdata-0.23.2/sdata.egg-info → sdata-0.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sdata
-Version: 0.23.2
+Version: 0.23.3
 Summary: a structured data format
 Home-page: https://github.com/lepy/sdata
 Author: Lepy

{sdata-0.23.2 → sdata-0.23.3}/sdata/__init__.py

@@ -1,7 +1,7 @@
 # -*-coding: utf-8-*-
 from __future__ import division
 
-__version__ = '0.23.2'
+__version__ = '0.23.3'
 __revision__ = None
 __version_info__ = tuple([int(num) for num in __version__.split('.')])
 
@@ -14,8 +14,8 @@ import uuid
 import logging
 
 # fix "ValueError: unsupported pickle protocol: 5"
-import pickle
-pickle.HIGHEST_PROTOCOL = 4
+#import pickle
+#pickle.HIGHEST_PROTOCOL = 4
 import pandas
 
 from sdata.metadata import Metadata, Attribute

{sdata-0.23.2 → sdata-0.23.3}/sdata/data.py

@@ -104,6 +104,7 @@ class Data(object):
         self.metadata.add(self.SDATA_CTIME, now_utc_str(), dtype="str", description="creation date")
         self.metadata.add(self.SDATA_MTIME, now_utc_str(), dtype="str", description="modification date")
         self.metadata.add(self.SDATA_URL, "", dtype="str", description="url of the data object")
+        self.metadata.add(self.SDATA_PROJECT, "", dtype="str", description="project name")
 
         metadata = kwargs.get("metadata")
         if metadata is not None:
@@ -130,7 +131,8 @@ class Data(object):
         self.table = kwargs.get("table", None)
         self._description = ""
         self.description = kwargs.get("description", "")
-        self.project = kwargs.get("project", "")
+        self.project = kwargs.get("project", "N.N.")
+        self.metadata.add(self.SDATA_PROJECT, self.project, dtype="str", description="project name")
 
         if (kwargs.get("uuid")=="" or kwargs.get("uuid") is not None) and not self.metadata.get(self.SDATA_UUID).value and kwargs.get("uuid")!="hash":
             # logger.info("uuid in kwargs")

{sdata-0.23.2 → sdata-0.23.3}/sdata/metadata.py

@@ -59,7 +59,7 @@ class Attribute(object):
     DTYPES_INV = {v: k for k, v in DTYPES.items()}
 
     def __init__(self, name, value, **kwargs):
-        """Attribute
+        """Attribute(name, value, dtype=str, unit="-", description="", label="", required=False)
         :param name
         :param value
         :param dtype ['float', 'int', 'str', 'timestamp', 'uuid?', 'unicode?']
@@ -303,10 +303,15 @@ class Metadata(object):
         required_attributes = [(attr.name, attr) for attr in self.attributes.values() if attr.required is True]
         return SortedDict(required_attributes)
 
+    def add_attribute(self, attr, **kwargs):
+        """set Attribute"""
+        prefix = kwargs.get("prefix", "")
+        self._attributes[prefix + attr.name] = attr
+
     def set_attr(self, name="N.N.", value=None, **kwargs):
         """set Attribute"""
         prefix = kwargs.get("prefix", "")
-        if isinstance(name, Attribute):
+        if isinstance(name, Attribute) or "Attribute" in name.__class__.__name__:
             attr = name # name is the Attribute!
         else:
             attr = self.get_attr(prefix + name) or Attribute(name, value, **kwargs)
@@ -419,6 +424,13 @@ class Metadata(object):
             d[attr.name] = attr.value
         return d
 
+    def get_dict(self):
+        """get user attribute as dict"""
+        d = {}
+        for attr in self.attributes.values():
+            d[attr.name] = attr.value
+        return d
+
     def _to_dataframe(self, attributes):
         """create dataframe from attributes"""
         d = self._to_dict(attributes)

{sdata-0.23.2 → sdata-0.23.3/sdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sdata
-Version: 0.23.2
+Version: 0.23.3
 Summary: a structured data format
 Home-page: https://github.com/lepy/sdata
 Author: Lepy