sdata 0.25.4__tar.gz → 0.25.6__tar.gz

{sdata-0.25.4/sdata.egg-info → sdata-0.25.6}/PKG-INFO

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

{sdata-0.25.4 → sdata-0.25.6}/sdata/__init__.py

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

{sdata-0.25.4 → sdata-0.25.6}/sdata/blob.py

@@ -5,14 +5,14 @@ import collections
 import pandas as pd
 import numpy as np
 from sdata.timestamp import TimeStamp
-from sdata.data import Data
+from sdata.base import Base
 from sdata.metadata import Metadata, Attribute
 import json
 import os
 import hashlib
 
 
-class Blob(Data):
+class Blob(Base):
     """Binary Large Object as reference
 
     .. warning::
@@ -31,7 +31,7 @@ class Blob(Data):
         :param kwargs:
 
         """
-        Data.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.metadata.add("blob_name", kwargs.get("name", ""))
         self.metadata.add("blob_type", "unknown")
         self.url = kwargs.get("url", "")

{sdata-0.25.4 → sdata-0.25.6}/sdata/data.py

@@ -1139,7 +1139,33 @@ class Data(object):
                 fh.write(exportstr)
 
     @classmethod
-    def from_csv(cls, s=None, filepath=None, sep=";"):
+    def from_csv(cls, filepath, sep=";"):
+        """import sdata.Data from csv
+
+        :param filepath:
+        :param sep: separator (default=";")
+        :return: sdata.Data
+        """
+        data = cls()
+        df = pd.read_csv(filepath, sep=";", comment="#", index_col=0)
+
+
+        #attr
+        sio = open(filepath, "r")
+        sio.seek(0)
+        attritute_list = []
+        for line in sio:
+            if line.startswith("#;"):
+                line = line.rstrip("\n")
+                line = line.split(sep)
+                attritute_list.append(line[1:8])
+        data.metadata = Metadata.from_list(attritute_list)
+        data.table = df
+        return data
+
+
+    @classmethod
+    def from_csv_string(cls, s=None, sep=";"):
         """import sdata.Data from csv
 
         :param s: csv str
@@ -1153,20 +1179,12 @@ class Data(object):
         data = cls()
         df = None
         try:
-            if filepath:
-                df = pd.read_csv(filepath, sep=";", comment="#", index_col=0)
-                sio = open(filepath, "r")
-                sio.seek(0)
-            elif s is not None:
-                sio = StringIO(s)
-                df = pd.read_csv(sio, sep=";", comment="#")
-                sio.seek(0)
-            else:
-                logger.error("data.from_csv: no csv data available")
+            sio = StringIO(s)
+            df = pd.read_csv(sio, sep=";", comment="#")
+            sio.seek(0)
         except Exception as exp:
             logging.error(f"{exp}")
             raise
-            return
 
         attritute_list = []
         for line in sio:

sdata-0.25.6/sdata/file.py

@@ -0,0 +1,42 @@
+from sdata import SUUID, Base
+import os
+
+class File(Base):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+    def exists(self, path):
+        filepath = os.path.join(path, self.name)
+        return os.path.exists(path)
+
+class Directory(Base):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.path = kwargs.get("path", os.getcwd())
+        self.files = {}
+
+    def register_files(self, path):
+        self.path = path
+        for f in os.listdir(self.path):
+            self.add(File(name=f))
+
+    def add(self, f):
+        """
+
+        """
+        self.files[f.name] = f
+
+    def ls(self):
+        """
+
+        """
+        return list(self.files.keys())
+
+if __name__ == '__main__':
+    f = File(name="a.txt")
+    print(f)
+
+    d = Directory(name="/folder")
+    d.add(f)
+    print(d.ls())
+    print(d)

{sdata-0.25.4 → sdata-0.25.6}/sdata/suuid.py

@@ -163,7 +163,7 @@ class SUUID:
         :return: suuid
         """
         name = cls._clean_name(name)
-        uid = cls.get_uuid_from_name(name=name, ns_name=ns_name)
+        uid = cls.get_uuid_from_name(name=class_name+name, ns_name=ns_name)
         suuid = cls(class_name=class_name, name=name, huuid=uid.hex)
         return suuid
 

{sdata-0.25.4 → sdata-0.25.6/sdata.egg-info}/PKG-INFO

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

{sdata-0.25.4 → sdata-0.25.6}/sdata.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ sdata/base.py
 sdata/blob.py
 sdata/data.py
 sdata/doe.py
+sdata/file.py
 sdata/image.py
 sdata/metadata.py
 sdata/node.py