pyLodStorage 0.0.7__tar.gz → 0.0.9__tar.gz

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.0.7
+Version: 0.0.9
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -14,6 +14,7 @@ Description: # pyLoDStorage
         python List of Dict (Table) Storage library
         
         [![pypi](https://img.shields.io/pypi/pyversions/pyLoDStorage)](https://pypi.org/project/pyLoDStorage/)
+        [![PyPI Status](https://img.shields.io/pypi/v/pyLoDStorage.svg)](https://pypi.python.org/pypi/pyLoDStorage/)
         [![Github Actions Build](https://github.com/WolfgangFahl/pyLoDStorage/workflows/Build/badge.svg?branch=master)](https://github.com/WolfgangFahl/pyLoDStorage/actions?query=workflow%3ABuild+branch%3Amaster)
         [![GitHub issues](https://img.shields.io/github/issues/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues)
         [![GitHub closed issues](https://img.shields.io/github/issues-closed/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues/?q=is%3Aissue+is%3Aclosed)

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/README.md

@@ -2,6 +2,7 @@
 python List of Dict (Table) Storage library
 
 [![pypi](https://img.shields.io/pypi/pyversions/pyLoDStorage)](https://pypi.org/project/pyLoDStorage/)
+[![PyPI Status](https://img.shields.io/pypi/v/pyLoDStorage.svg)](https://pypi.python.org/pypi/pyLoDStorage/)
 [![Github Actions Build](https://github.com/WolfgangFahl/pyLoDStorage/workflows/Build/badge.svg?branch=master)](https://github.com/WolfgangFahl/pyLoDStorage/actions?query=workflow%3ABuild+branch%3Amaster)
 [![GitHub issues](https://img.shields.io/github/issues/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues/?q=is%3Aissue+is%3Aclosed)

pylodstorage-0.0.9/lodstorage/jsonable.py

@@ -0,0 +1,198 @@
+'''This module has a class JSONAble for serialization of tables/list of dicts to and from JSON encoding
+
+Created on 2020-09-03
+
+@author: wf
+'''
+import json
+import datetime
+import re
+
+class JSONAble(object):
+    '''
+    mixin to allow classes to be JSON serializable see
+    
+    - https://stackoverflow.com/questions/3768895/how-to-make-a-class-json-serializable
+    
+    '''
+    indent=4
+    
+    '''
+    regular expression to be used for conversion from singleQuote to doubleQuote
+    see https://stackoverflow.com/a/50257217/1497139
+    '''
+    singleQuoteRegex = re.compile('(?<!\\\\)\'')
+ 
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        
+    @staticmethod 
+    def singleQuoteToDoubleQuote(singleQuoted,useRegex=False):
+        '''
+        convert a single quoted string to a double quoted one
+        
+        Args:
+            singleQuoted (str): a single quoted string e.g.
+            
+                .. highlight:: json
+                
+                {'cities': [{'name': "Upper Hell's Gate"}]}
+                
+            useRegex (boolean): True if a regular expression shall be used for matching
+            
+        Returns:
+            string: the double quoted version of the string 
+        
+        Note:
+            see
+            - https://stackoverflow.com/questions/55600788/python-replace-single-quotes-with-double-quotes-but-leave-ones-within-double-q 
+
+        '''
+        if useRegex:
+            doubleQuoted=JSONAble.singleQuoteToDoubleQuoteUsingRegex(singleQuoted)
+        else:
+            doubleQuoted=JSONAble.singleQuoteToDoubleQuoteUsingBracketLoop(singleQuoted)
+        return doubleQuoted
+    
+    @staticmethod
+    def singleQuoteToDoubleQuoteUsingRegex(singleQuoted):
+        """
+        convert a single quoted string to a double quoted one using a regular expression
+        
+        Args:
+            singleQuoted(string): a single quoted string e.g. {'cities': [{'name': "Upper Hell's Gate"}]}
+            useRegex(boolean): True if a regular expression shall be used for matching
+        Returns:
+            string: the double quoted version of the string e.g. 
+        Note:
+            see https://stackoverflow.com/a/50257217/1497139
+        """
+        doubleQuoted=JSONAble.singleQuoteRegex.sub('\"', singleQuoted)
+        return doubleQuoted
+    
+    @staticmethod    
+    def singleQuoteToDoubleQuoteUsingBracketLoop(singleQuoted):  
+        """
+        convert a single quoted string to a double quoted one using a regular expression
+        
+        Args:
+            singleQuoted(string): a single quoted string e.g. {'cities': [{'name': "Upper Hell's Gate"}]}
+            useRegex(boolean): True if a regular expression shall be used for matching
+        Returns:
+            string: the double quoted version of the string e.g. 
+        Note:
+            see https://stackoverflow.com/a/63862387/1497139
+        
+        """
+        cList=list(singleQuoted)
+        inDouble=False;
+        inSingle=False;
+        for i,c in enumerate(cList):
+            #print ("%d:%s %r %r" %(i,c,inSingle,inDouble))
+            if c=="'":
+                if not inDouble:
+                    inSingle=not inSingle
+                    cList[i]='"'
+            elif c=='"':
+                inDouble=not inDouble
+                inSingle=False
+        doubleQuoted="".join(cList)    
+        return doubleQuoted
+    
+    def fromJson(self,jsonStr,types=None):
+        '''
+        initialize me from the given JSON string
+        
+        Args:
+            jsonStr(str): the JSON string
+            fixType(Types): the types to be fixed
+        '''
+        data=json.loads(jsonStr)       
+        if types is not None:
+            types.fixTypes(data)                      
+        self.__dict__=data
+    
+    def toJsonAbleValue(self,v):
+        '''
+        return the JSON able value of the given value v
+        Args:
+            v(object): the value to convert
+        '''
+        # objects have __dict__ hash tables which can be JSON-converted
+        if (hasattr(v, "__dict__")):
+            return v.__dict__
+        elif isinstance(v,datetime.datetime):
+            return v.isoformat()
+        elif isinstance(v,datetime.date):
+            return v.isoformat()
+        else:
+            return ""
+        
+    def toJSON(self):
+        '''
+        Returns:
+            a recursive JSON dump of the dicts of my objects
+        '''
+        jsonStr=json.dumps(self, default=lambda v: self.toJsonAbleValue(v), 
+            sort_keys=True, indent=JSONAble.indent)
+        return jsonStr
+        
+    def getJSONValue(self,v):
+        '''
+        get the value of the given v as JSON
+        
+        Args:
+            v(object): the value to get
+            
+        Returns:
+            the the value making sure objects are return as dicts
+        '''
+        if (hasattr(v, "asJSON")):
+            return v.asJSON(asString=False)
+        elif type(v) is dict:
+            return self.reprDict(v)
+        elif type(v) is list:
+            vlist=[]
+            for vitem in v:
+                vlist.append(self.getJSONValue(vitem))
+            return vlist
+        elif isinstance(v,datetime.datetime):
+            return v.isoformat()
+        elif isinstance(v,datetime.date):
+            return v.isoformat()
+        elif isinstance(v,bool):
+            # convert True,False to -> true,false
+            return str(v).lower()
+        else:   
+            return v
+    
+    def reprDict(self,srcDict):
+        '''
+        get the given srcDict as new dict with fields being converted with getJSONValue
+        
+        Args:
+            scrcDict(dict): the source dictionary
+        
+        Returns
+            dict: the converted dictionary
+        '''
+        d = dict()
+        for a, v in srcDict.items():
+            d[a]=self.getJSONValue(v)
+        return d
+    
+    def asJSON(self,asString=True):
+        '''
+        recursively return my dict elements
+        
+        Args:
+            asString(boolean): if True return my result as a string
+        '''
+        jsonDict=self.reprDict(self.__dict__)
+        if asString:
+            jsonStr=str(jsonDict)
+            jsonStr = JSONAble.singleQuoteToDoubleQuote(jsonStr)
+            return jsonStr
+        return jsonDict

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/lodstorage/sample.py

@@ -5,6 +5,7 @@ Created on 2020-08-24
 '''
 import urllib.request
 import json
+from lodstorage.jsonable import JSONAble
 from datetime import date, datetime
 
 class Sample(object):
@@ -68,4 +69,11 @@ class Sample(object):
             person['ofAge']=age>=18
             person['lastmodified']=datetime.now()
         return listOfDicts
-        
+        
+class Royals(JSONAble):
+    def __init__(self):
+        self.royals=Sample.getRoyals()
+        
+class Cities(JSONAble):
+    def __init__(self):
+        self.cities=Sample.getCities()        

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/lodstorage/sql.py

@@ -82,8 +82,13 @@ class SQLDB(object):
         '''
         debugInfo=""
         if not executeMany:
+            # shall we shoe the details of the record (which might be a security risk)
             if self.errorDebug:
+                # show details of record
                 debugInfo="\nrecord  #%d=%s" % (index,repr(record))
+            else:
+                # show only index
+                debugInfo="\nrecord #%d" % index
         return debugInfo
         
        
@@ -124,6 +129,10 @@ class SQLDB(object):
                 raise Exception("%s\nfailed: error binding column '%s'%s" % (insertCmd,columnName,debugInfo))
             else:
                 raise ie
+        except Exception as ex:
+            debugInfo=self.getDebugInfo(record, index, executeMany)
+            msg="%s\nfailed:%s%s" % (insertCmd,str(ex),debugInfo)
+            raise Exception(msg)
         
     def query(self,sqlQuery):
         '''

pylodstorage-0.0.9/lodstorage/types.py

@@ -0,0 +1,108 @@
+'''
+Created on 2020-09-12
+
+@author: wf
+'''
+import datetime
+import sys
+class Types(object):
+    '''
+    Types
+    
+    holds entity meta Info 
+    
+    :ivar name(string): entity name = table name
+    '''
+
+    def __init__(self,name):
+        '''
+        Constructor
+        '''
+        self.name=name
+        self.typeMap={}
+        
+    def addType(self,listName,field,valueType):
+        '''
+        add the python type for the given field to the typeMap
+        
+        Args:
+           listName(string): the name of the list of the field
+           field(string): the name of the field
+           
+           valueType(type): the python type of the field
+        '''
+        if listName not in self.typeMap:
+            self.typeMap[listName]={}
+        typeMap=self.typeMap[listName]    
+        if not field in typeMap:
+            typeMap[field]=valueType
+            
+    def getTypes(self,listName,sampleRecords,limit=10):   
+        '''
+        determine the types for the given sample records
+        '''     
+        for sampleRecord in sampleRecords[:limit]:
+            for key,value in sampleRecord.items():
+                valueType=None
+                if value is None:
+                    if len(sampleRecords)==1:
+                        print("Warning sampleRecord field %s is None - using string as type" % key)
+                        valueType=str
+                else:
+                    valueType=type(value)
+                if valueType == str:
+                    pass
+                elif valueType == int:
+                    pass
+                elif valueType == float:
+                    pass
+                elif valueType == bool:
+                    pass      
+                elif valueType == datetime.date:
+                    pass    
+                elif valueType== datetime.datetime:
+                    pass
+                else:
+                    if valueType is not None:
+                        msg="warning: unsupported type %s for field %s " % (str(valueType),key)
+                        print(msg)
+                if valueType is not None:
+                    self.addType(listName,key,valueType) 
+                    
+    def fixTypes(self,data):
+        '''
+        fix the types in the given data structure
+        
+        Args:
+            data(dict): a dict representation returned from storage
+            with list of Dicts as entries
+        '''
+        for listName in self.typeMap:
+            if listName in data:
+                self.fixListOfDicts(self.typeMap[listName],data[listName])
+    
+    def fixListOfDicts(self,typeMap,listOfDicts):
+        '''
+        fix the type in the given list of Dicts
+        '''
+        for record in listOfDicts:
+            for keyValue in record.items():
+                key,value=keyValue
+                if key in typeMap:
+                    valueType=typeMap[key]
+                    if valueType==bool:
+                        b= value in ['True','TRUE','true']
+                        record[key]=b
+                    elif valueType==datetime.date:
+                        dt=datetime.datetime.strptime(value,"%Y-%m-%d") 
+                        record[key]=dt.date()
+                    elif valueType==datetime.datetime:
+                        # see https://stackoverflow.com/questions/127803/how-do-i-parse-an-iso-8601-formatted-date
+                        if sys.version_info >= (3, 7):
+                            dtime=datetime.datetime.fromisoformat(value)
+                        else:
+                            dtime=datetime.datetime.strptime(value,"%Y-%m-%dT%H:%M:%S.%f")  
+                        record[key]=dtime
+
+                        
+        

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/pylodstorage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.0.7
+Version: 0.0.9
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -14,6 +14,7 @@ Description: # pyLoDStorage
         python List of Dict (Table) Storage library
         
         [![pypi](https://img.shields.io/pypi/pyversions/pyLoDStorage)](https://pypi.org/project/pyLoDStorage/)
+        [![PyPI Status](https://img.shields.io/pypi/v/pyLoDStorage.svg)](https://pypi.python.org/pypi/pyLoDStorage/)
         [![Github Actions Build](https://github.com/WolfgangFahl/pyLoDStorage/workflows/Build/badge.svg?branch=master)](https://github.com/WolfgangFahl/pyLoDStorage/actions?query=workflow%3ABuild+branch%3Amaster)
         [![GitHub issues](https://img.shields.io/github/issues/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues)
         [![GitHub closed issues](https://img.shields.io/github/issues-closed/WolfgangFahl/pyLoDStorage.svg)](https://github.com/WolfgangFahl/pyLoDStorage/issues/?q=is%3Aissue+is%3Aclosed)

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/pylodstorage.egg-info/SOURCES.txt

@@ -1,8 +1,10 @@
 README.md
 setup.py
 lodstorage/__init__.py
+lodstorage/jsonable.py
 lodstorage/sample.py
 lodstorage/sql.py
+lodstorage/types.py
 lodstorage/uml.py
 pylodstorage.egg-info/PKG-INFO
 pylodstorage.egg-info/SOURCES.txt

{pylodstorage-0.0.7 → pylodstorage-0.0.9}/setup.py

@@ -11,7 +11,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='pylodstorage',
-    version='0.0.7',
+    version='0.0.9',
 
     packages=['lodstorage',],
     author='Wolfgang Fahl',