pyLodStorage 0.0.43__tar.gz → 0.0.45__tar.gz

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.0.43
+Version: 0.0.45
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/lodstorage/entity.py

@@ -70,9 +70,10 @@ class EntityManager(YamlAbleMixin, JsonPickleMixin):
             config(StorageConfig): if None get the cache for my mode
             mode(StoreMode): the storeMode to use
         '''
-        cachedir=EntityManager.getCachePath()
-        if config is not None and config.cacheFile is not None:
-            return config.cacheFile
+        if config is not None:
+            cachedir=config.getCachePath() 
+            if config.cacheFile is not None:
+                return config.cacheFile
         ''' get the path to the file for my cached data '''  
         if mode is StoreMode.JSON:  
             cachepath="%s/%s-%s.%s" % (cachedir,self.name,"events",'json')
@@ -84,6 +85,14 @@ class EntityManager(YamlAbleMixin, JsonPickleMixin):
             cachepath="undefined cachepath for %s" % (mode)
         return cachepath     
     
+    def removeCacheFile(self):
+        '''  remove my cache file '''
+        mode=self.config.mode
+        if mode is StoreMode.JSON:
+            cacheFile=self.getCacheFile(mode=mode)
+            if os.path.isfile(cacheFile):
+                os.remove(cacheFile)
+    
     def getSQLDB(self,cacheFile):
         '''
         get the SQL database for the given cacheFile
@@ -227,11 +236,6 @@ SELECT ?eventId ?acronym ?series ?title ?year ?country ?city ?startDate ?endDate
                 cacheFile=self.getCacheFile(config=self.config,mode=StoreMode.JSON)
             self.showProgress ("storing %d events for %s to cache %s" % (len(self.events),self.name,cacheFile))
             self.writeJson(cacheFile)
-        elif mode is StoreMode.DGRAPH:
-            startTime=time.time()
-            self.showProgress ("storing %d %s for %s to %s" % (len(self.events),self.entityPluralName,self.name,self.mode))    
-            self.dgraph.addData(listOfDicts,limit=limit,batchSize=batchSize)
-            self.showProgress ("store for %s done after %5.1f secs" % (self.name,time.time()-startTime))
         elif mode is StoreMode.SPARQL:
             startTime=time.time()
             # @ FIXME make abstract 

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/lodstorage/storageconfig.py

@@ -4,9 +4,8 @@ Created on 2020-08-29
 @author: wf
 '''
 from enum import Enum
-import os
 from pathlib import Path
-
+import os
 class StoreMode(Enum):
     '''
     possible supported storage modes
@@ -22,8 +21,18 @@ class StorageConfig(object):
     a storage configuration
     '''
     
-    @classmethod        
-    def getCachePath(cls,name:str)->str:
+    def ensureDirectoryExists(self,file_path:str):
+        '''
+        check that the given path exists and otherwise create it
+        
+        Args
+            file_path(str): the path to check
+        '''
+        directory = os.path.dirname(file_path)
+        if not os.path.exists(directory):
+            os.makedirs(directory)
+           
+    def getCachePath(self,ensureExists=True)->str:
         '''
         get the path to the default cache
         
@@ -31,10 +40,12 @@ class StorageConfig(object):
             name(str): the name of the cache to use
         '''
         home = str(Path.home())
-        cachedir=f"{home}/{name}"
+        cachedir=f"{home}/.{self.cacheDirName}"
+        if ensureExists:
+            self.ensureDirectoryExists(cachedir)
         return cachedir
 
-    def __init__(self, mode=StoreMode.SQL,cacheFile=None,withShowProgress=True,profile=True,debug=False,errorDebug=True):
+    def __init__(self, mode=StoreMode.SQL,cacheDirName="lodstorage",cacheFile=None,withShowProgress=True,profile=True,debug=False,errorDebug=True):
         '''
         Constructor
         
@@ -46,6 +57,7 @@ class StorageConfig(object):
             debug(boolean): True if debugging information should be shown
             errorDebug(boolean): True if debug info should be provided on errors (should not be used for production since it might reveal data)
         '''
+        self.cacheDirName=cacheDirName
         self.mode=mode
         self.cacheFile=cacheFile
         self.profile=profile

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/pylodstorage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.0.43
+Version: 0.0.45
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/pylodstorage.egg-info/requires.txt

@@ -1,3 +1,4 @@
 SPARQLWrapper
 PyYAML
 pandas
+jsonpickle

{pylodstorage-0.0.43 → pylodstorage-0.0.45}/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.43',
+    version='0.0.45',
 
     packages=['lodstorage',],
     author='Wolfgang Fahl',
@@ -30,7 +30,8 @@ setup(
     install_requires=[
           'SPARQLWrapper',
           'PyYAML',
-          'pandas'
+          'pandas',
+          'jsonpickle',
     ],
     classifiers=[
             'Programming Language :: Python',