sdata 0.23.0__tar.gz → 0.23.2__tar.gz

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

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

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

@@ -1,7 +1,7 @@
 # -*-coding: utf-8-*-
 from __future__ import division
 
-__version__ = '0.23.0'
+__version__ = '0.23.2'
 __revision__ = None
 __version_info__ = tuple([int(num) for num in __version__.split('.')])
 

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

@@ -189,7 +189,7 @@ class Data(object):
     def __eq__(self, other):
         """compare Data checksum
         
-        :param other: sdata.Data objecet
+        :param other: sdata.Data object
         :return: True or False
         """
         if not isinstance(other, self.__class__):
@@ -656,6 +656,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.0 → sdata-0.23.2}/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.0 → sdata-0.23.2}/sdata/image.py

@@ -12,6 +12,8 @@ import sdata.contrib.piexif
 import sdata.contrib.piexif.helper
 import json
 import os
+from io import BytesIO
+import base64
 import hashlib
 try:
     import PIL
@@ -47,15 +49,68 @@ class Image(Data):
     def _from_filepath(cls, filepath, **kwargs):
         """read image from file
 
+        :param fielpath: image file path
+        :return: sdata.Image
         """
         project = kwargs.get("project")
         suuid = SUUID.from_file(cls.__class__.__name__, filepath, ns_name=project)
         kwargs["uuid"] = suuid.huuid
         kwargs["url"] = filepath
-
         data = cls(name=os.path.basename(filepath), **kwargs)
         return data
 
+    @classmethod
+    def from_image(cls, name, img, **kwargs):
+        """read image from PIL.Image
+
+        """
+        project = kwargs.get("project", "")
+        parent = kwargs.get("parent", "")
+        class_name = "Image" #cls.__class__.__name__
+
+        sh = hashlib.sha3_256()
+        sh.update(img.tobytes())
+        suuid = SUUID.from_name(class_name=class_name, name=sh.hexdigest(), ns_name=project)
+        suuid.project = project
+        kwargs["parent"] = parent
+        kwargs["project"] = suuid.project
+        kwargs["sname"] = suuid.sname
+        kwargs["uuid"] = suuid.huuid
+        kwargs["suuid"] = suuid.idstr
+        kwargs["url"] = sdata.osname(name)
+        # name = os.path.basename(filepath)
+        data = cls(name=name, **kwargs)
+        data.img = img
+        return data
+
+
+    @classmethod
+    def from_bytes(cls, name, image_data, **kwargs):
+        """read image from file
+
+        """
+        project = kwargs.get("project")
+        class_name = "Image" #cls.__class__.__name__
+        suuid = SUUID.from_str(class_name, name, ns_name=project)
+        kwargs["sname"] = suuid.sname
+        kwargs["uuid"] = suuid.huuid
+        kwargs["suuid"] = suuid.idstr
+        kwargs["url"] = name
+        data = cls(name=name, **kwargs)
+        data.img = PIL.Image.open(BytesIO(image_data))
+        try:
+            d = None
+            if name.lower().endswith(".png"):
+                d = cls._get_png_metadata(image_data)
+            elif name.lower().endswith(("jpg", "jpeg")):
+                d = cls._get_jpg_metadata(image_data)
+            if d is not None:
+                data.metadata = data.metadata.from_json(d)
+        except:
+            pass
+        return data
+
+
     @classmethod
     def from_file(cls, filepath, **kwargs):
         """read image from file
@@ -73,7 +128,7 @@ class Image(Data):
 
         if filepath.lower().endswith(".png"):
             data = cls.from_png(filepath, **kwargs)
-        elif filepath.lower().endswith(".jpg"):
+        elif filepath.lower().endswith(("jpg", "jpeg")):
             data = cls.from_jpg(filepath, **kwargs)
         else:
             data = cls(name=name, **kwargs)
@@ -228,4 +283,26 @@ class Image(Data):
         json_string = json.dumps(self.metadata.to_json())
         exif_dict = {"Exif": {sdata.contrib.piexif.ExifIFD.UserComment: sdata.contrib.piexif.helper.UserComment.dump(json_string)}}
         exif_bytes = sdata.contrib.piexif.dump(exif_dict)
-        self.img.save(filepath, "jpeg", exif=exif_bytes)
+        self.img.save(filepath, "jpeg", exif=exif_bytes)
+
+    def get_image_download_link(self, img, filename, text):
+
+        json_string = json.dumps(self.metadata.to_json())
+        buffered = BytesIO()
+
+        if filename.endswith(".png"):
+            metadaten = PIL.PngImagePlugin.PngInfo()
+            metadaten.add_text("sdata", json_string)
+            img.save(buffered, "PNG", pnginfo=metadaten)
+        elif filename.lower().endswith(".jpg"):
+            exif_dict = {"Exif": {
+                sdata.contrib.piexif.ExifIFD.UserComment: sdata.contrib.piexif.helper.UserComment.dump(json_string)}}
+            exif_bytes = sdata.contrib.piexif.dump(exif_dict)
+            img.save(buffered, format="JPEG", exif=exif_bytes)
+        else:
+            logging.warning(f"metadata not supported for {filepath}")
+            img.save(buffered)
+
+        img_str = base64.b64encode(buffered.getvalue()).decode()
+        href = f'<a href="data:file/txt;base64,{img_str}" download="{filename}">{text}</a>'
+        return href

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

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