sdata 0.23.1__tar.gz → 0.23.3__tar.gz

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

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

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

@@ -1,7 +1,7 @@
 # -*-coding: utf-8-*-
 from __future__ import division
 
-__version__ = '0.23.1'
+__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.1 → 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")
@@ -656,6 +658,14 @@ class Data(object):
     def mdf(self):
         return self.metadata.df
 
+    @property
+    def udf(self):
+        return self.metadata.udf
+
+    @property
+    def sdf(self):
+        return self.metadata.sdf
+
     @property
     def md(self):
         return self.metadata

{sdata-0.23.1 → sdata-0.23.3}/sdata/experiments/__init__.py

@@ -21,6 +21,21 @@ class TestProgram(Data):
     """A sdata Testprogram
 
     """
+    ATTRIBUTES = [
+        ['material_name', '', 'str', '-', 'Der Name des Materials.', '', False],
+        ['material_norm_name', '', 'str', '-', 'Der normative Name des Materials.', '', False],
+        ['material_number_norm', '', 'str', '-', 'Die normative Nummer des Materials.', '', False],
+        ['material_manifacturer', '', 'str', '-', 'Die Hersteller des Materials.', '', False],
+        ['material_grade', '', 'str', '-', 'Der Zustand des Materials.', '', False],
+        ['material_coating', '', 'str', '-', 'Die Beschichtung des Materials.', '', False],
+        ['material_density', '', 'float', 'g/cm^3', 'Die Dichte des Materials.', '', False],
+        ['material_production_date', '', 'str', '-', 'Das Produktionsdatum des Materials.', '', False],
+        ['responsible_person', '', 'str', '-', 'Verantwortlicher des Testprogramms.', '', False],
+        ['responsible_person_phone', '', 'str', '-', 'Telefonnummer des Verantwortlichen vom Testprogramms.', '', False],
+        ['responsible_person_email', '', 'str', '-', 'Emailadressen des Verantwortlichen vom Testprogramms.', '', False],
+        ['responsible_person_organisation', '', 'str', '-', 'Organisation des Verantwortlichen vom Testprogramms.', '', False],
+        ['notes', '', 'str', '-', 'Notizen zum Testprogramm.', '', False],
+        ]
 
     def __init__(self, **kwargs):
         """
@@ -48,13 +63,26 @@ class TestProgram(Data):
         if kwargs.get("uuid_testprogram") is not None:
             self._set_uuid(kwargs.get("uuid_testprogram"))
 
+        for attrlist in self.ATTRIBUTES:
+            self.metadata.set_attr(attrlist[0], attrlist[1],
+                                   dtype=attrlist[2],
+                                   unit=attrlist[3],
+                                   description=attrlist[4],
+                                   label=attrlist[5],
+                                   required=attrlist[6])
+
+
     def gen_testseries(self, **kwargs):
         """generate TestSeries instance
 
         :param kwargs:
         :return: TestSeries()
         """
-        ts = TestSeries(**kwargs)
+        class_name = kwargs.get("class_name", TestSeries)
+        if "class_name" in kwargs:
+            kwargs.pop("class_name")
+
+        ts = class_name(**kwargs)
         ts.project = self.project
         ts.name_testprogram = self.name_testprogram
         ts.uuid_testprogram = self.uuid_testprogram
@@ -63,7 +91,7 @@ class TestProgram(Data):
 
     @property
     def longname(self):
-        return "_".join([self.name_testprogram])
+        return "|".join([self.name_testprogram])
 
 class TestSeries(TestProgram):
     """A sdata TestSeries
@@ -75,6 +103,8 @@ class TestSeries(TestProgram):
 
     SDATA_TESTTYPE = "!sdata_testtype"
 
+
+
     def __init__(self, **kwargs):
         """Test Series
 
@@ -185,7 +215,11 @@ class TestSeries(TestProgram):
         :param kwargs:
         :return: Test()
         """
-        t = Test(**kwargs)
+        class_name = kwargs.get("class_name", Test)
+        if "class_name" in kwargs:
+            kwargs.pop("class_name")
+
+        t = class_name(**kwargs)
         t.name_testprogram = self.name_testprogram
         t.uuid_testprogram = self.uuid_testprogram
         t.name_testseries = self.name_testseries
@@ -198,7 +232,7 @@ class TestSeries(TestProgram):
 
     @property
     def longname(self):
-        return "_".join([self.name_testprogram, self.name])
+        return "|".join([self.name_testprogram, self.name])
 
 
 class Test(TestSeries):
@@ -209,14 +243,15 @@ class Test(TestSeries):
     SDATA_TESTSERIES_NAME = "!sdata_testseries_name"
     SDATA_TESTSERIES_UUID = "!sdata_testseries_uuid"
 
+
     def __init__(self, **kwargs):
         """Test
 
         :param kwargs:
         """
         TestSeries.__init__(self, **kwargs)
-        self.metadata.add(name=self.SDATA_TESTSERIES_NAME, value="N.N.", dtype="str")
-        self.metadata.add(name=self.SDATA_TESTSERIES_UUID, value="", dtype="str")
+        self.metadata.add(name=self.SDATA_TESTSERIES_NAME, value="N.N.", dtype="str", description="name of the testseries")
+        self.metadata.add(name=self.SDATA_TESTSERIES_UUID, value="", dtype="str", description="uuid of the testseries")
 
         if kwargs.get("name") is not None:
             self._set_name(kwargs.get("name"))
@@ -235,6 +270,7 @@ class Test(TestSeries):
             # print("uuid_testprogram", kwargs.get("uuid_testprogram"), self._set_uuid_testprogram)
             self._set_uuid_testprogram(kwargs.get("uuid_testprogram"))
 
+
     def _get_uuid_testseries(self):
         return self.metadata.get(self.SDATA_TESTSERIES_UUID).value
 
@@ -284,7 +320,7 @@ class Test(TestSeries):
 
     @property
     def longname(self):
-        return "_".join([self.name_testprogram, self.name_testseries, self.name])
+        return "|".join([self.name_testprogram, self.name_testseries, self.name])
 
 
 

{sdata-0.23.1 → 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.1 → sdata-0.23.3/sdata.egg-info}/PKG-INFO

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