Improved import/export functionality (packageLibImporter.py -> module_importer.py)

workflows/interaction_views.py

@@ -3,10 +3,10 @@ from django.shortcuts import render
 from decision_support.interaction import *
 from subgroup_discovery.interaction import *
 
-from workflows import packageLibImporter
+from workflows import module_importer
 def setattr_local(name, value, package):
     setattr(sys.modules[__name__], name, value)
-packageLibImporter.importAllPackagesLib("interaction_views",setattr_local)
+module_importer.import_all_packages_libs("interaction_views",setattr_local)
 
 def test_interaction(request,input_dict,output_dict,widget):
     return render(request, 'interactions/test_interaction.html',{'widget':widget})

workflows/latino/settings.py

 import os
 
 # === STANDARD PACKAGE SETTINGS ===
-package_root = os.path.dirname(__file__)
+PACKAGE_ROOT = os.path.dirname(__file__)
 
 # === AUTO IMPORT OPTIONS ===
-#If auto_import_package_data is true then package_data.json file is automatically imported when ClowdFlows project is newly deployed or refreshed from git
-auto_import_package_data = True
+#If auto_import_package_data is true then given data file is automatically imported when ClowdFlows project is newly deployed or refreshed from git
+AUTO_IMPORT_DB = False
 #For auto_import_package_data_replace_option description see the 'replace' option in workflows/import_package command
-auto_import_package_data_replace_option = True
+AUTO_IMPORT_DB_REPLACE_OPTION = True
 #If file(s) other than ./db/package_data.json should be imported, auto_import_package_data_files should be corrected
-auto_import_package_data_files = [os.path.join(package_root,'db/package_data.json')]
+AUTO_IMPORT_DB_FILES = [os.path.join(PACKAGE_ROOT,'db/package_data.json')]
 

workflows/library.py

@@ -6,10 +6,10 @@ import sys
 from decision_support.library import *
 from subgroup_discovery.library import *
 
-from workflows import packageLibImporter
+from workflows import module_importer
 def setattr_local(name, value, package):
     setattr(sys.modules[__name__], name, value)
-packageLibImporter.importAllPackagesLib("library",setattr_local)
+module_importer.import_all_packages_libs("library",setattr_local)
 
 def test_interaction(input_dict):
     return input_dict

workflows/management/commands/export_package.py

@@ -30,110 +30,111 @@ class Command(BaseCommand):
         except:
             raise CommandError('There was a problem with creating/overwriting given output file')
 
-        result = self.export_package_string(self.stdout.write, args[1:], options['newuid'], options['all'], int(options['verbosity']))
+        result = export_package_string(self.stdout.write, args[1:], options['newuid'], options['all'], int(options['verbosity']))
 
         try:
             f.write(result.encode('utf-8'))
         except:
             raise CommandError('There was a problem with writing to the given output file')
 
+        verbosity = int(options['verbosity'])
+        if verbosity>0 and verbosity<3:
+            self.stdout.write('Tip: use higher "verbosity" option numbers to se more detailed output of what is being exported.\n')
         self.stdout.write('Export procedure successfully finished. Results written to the file.\n')
 
-    def print_stataistics(self, objs, verbosity, write):
-        if verbosity > 0:
-            write('Selection contains:\n')
-            write('    % 4i AbstractWidget(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractWidget)]))
-            write('    % 4i AbstractInput(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractInput)]))
-            write('    % 4i AbstractOutput(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractOutput)]))
-            write('    % 4i AbstractOption(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractOption)]))
-            write('    % 4i Category(s)\n' % len([obj for obj in objs if isinstance(obj, Category)]))
-
-            if (verbosity == 1):
-                write('Exported categories:\n')
-            if (verbosity == 2):
-                write('Exported categories and widgets:\n')
-            if (verbosity == 2):
-                write('Exported categories, widgets, inputs, outputs and options:\n')
-            indent = 0
-            indentAddon = 0
-            for obj in objs:
-                s = ''
-                if isinstance(obj, Category):
-                    indent = str(obj).count('::')
-                    s = '% 3i. Category ===== %s =====' % (obj.order, obj)
-                if isinstance(obj, AbstractWidget):
-                    s = '    % 3i. AbstractWidget: %s [%s]' % (obj.order, obj.name, obj.action)
-                if isinstance(obj, AbstractInput):
-                    s = '        % 3i. AbstractInput: (%s) %s' % (obj.order, obj.short_name, obj.name)
-                if isinstance(obj, AbstractOutput):
-                    s = '        % 3i. AbstractOutput: (%s) %s' % (obj.order, obj.short_name, obj.name)
-                if isinstance(obj, AbstractOption):
-                    s = '                AbstractOption: %s | %s' % (obj.name, obj.value)
-
-                if isinstance(obj, Category) or (isinstance(obj, AbstractWidget) and verbosity > 1) or verbosity > 2:
-                    write('    ' * indent + s + '\n')
-
-            self.stdout.write(
-                'Tip: use higher "verbosity" option numbers to se more detailed output of what is being exported.\n')
-
-    def export_package_string(self, write, packages, newuid, all, verbosity):
-        assert isinstance(packages, tuple)
-        assert isinstance(newuid, bool)
-        assert isinstance(all, bool)
-
-        objs = []
-        for topCat in Category.objects.filter(parent = None):
-            objs.extend(self.get_package_objs_in_category(topCat, packages, all))
-
-        if len(objs) == 0:
-            write('Selected package(s) were not found!\n')
-            return "[\\n]"
-
-        #be careful uid is only changed on these instances and is not written to the database
-        if newuid:
-            for a in objs:
-                a.uid = str(uuid.uuid4())
-
-        self.print_stataistics(objs, verbosity, write)
-
-        result = serializers.serialize("json", objs, indent=2, ensure_ascii=False)
-
-        return result
-
-    def get_package_objs_in_category(self, cat, packages, all):
-        assert isinstance(cat, Category)
-        assert isinstance(packages, tuple)
-        assert isinstance(all, bool)
-
-        objs = []
-
-        objs.extend(self.get_package_wids_in_category(cat, packages, all))
-
-        for catChild in cat.children.all():
-            objs.extend(self.get_package_objs_in_category(catChild, packages, all))
-
-        if len(objs)>0:
-            objs.insert(0,cat)
-
-        return objs
-
-    def get_package_wids_in_category(self, cat, packages, all):
-        assert isinstance(cat, Category)
-        assert isinstance(packages, tuple)
-        assert isinstance(all, bool)
-
-        objs = []
-
-        if all:
-            wids = cat.widgets.all()
-        else:
-            wids = cat.widgets.filter(package__in=packages)
-
-        for wid in wids:
-            objs.append(wid)
-            for inp in wid.inputs.all():
-                objs.append(inp)
-                objs.extend(inp.options.all())
-            objs.extend(wid.outputs.all())
-
-        return objs
+def export_package_string(writeFunc, packages, newuid, all, verbosity):
+    assert isinstance(packages, tuple)
+    assert isinstance(newuid, bool)
+    assert isinstance(all, bool)
+
+    objs = []
+    for topCat in Category.objects.filter(parent = None):
+        objs.extend(get_package_objs_in_category(topCat, packages, all))
+
+    if len(objs) == 0:
+        writeFunc('Selected package(s) were not found!\n')
+        return "[\\n]"
+
+    #be careful uid is only changed on these instances and is not written to the database
+    if newuid:
+        for a in objs:
+            a.uid = str(uuid.uuid4())
+
+    print_stataistics(objs, verbosity, writeFunc)
+
+    result = serializers.serialize("json", objs, indent=2, ensure_ascii=False)
+
+    return result
+
+def get_package_objs_in_category(cat, packages, all):
+    assert isinstance(cat, Category)
+    assert isinstance(packages, tuple)
+    assert isinstance(all, bool)
+
+    objs = []
+
+    objs.extend(get_package_wids_in_category(cat, packages, all))
+
+    for catChild in cat.children.all():
+        objs.extend(get_package_objs_in_category(catChild, packages, all))
+
+    if len(objs)>0:
+        objs.insert(0,cat)
+
+    return objs
+
+def get_package_wids_in_category(cat, packages, all):
+    assert isinstance(cat, Category)
+    assert isinstance(packages, tuple)
+    assert isinstance(all, bool)
+
+    objs = []
+
+    if all:
+        wids = cat.widgets.all()
+    else:
+        wids = cat.widgets.filter(package__in=packages)
+
+    for wid in wids:
+        objs.append(wid)
+        for inp in wid.inputs.all():
+            objs.append(inp)
+            objs.extend(inp.options.all())
+        objs.extend(wid.outputs.all())
+
+    return objs
+
+def print_stataistics(objs, verbosity, writeFunc):
+    if verbosity > 0:
+        writeFunc('Selection contains:\n')
+        writeFunc('    % 4i AbstractWidget(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractWidget)]))
+        writeFunc('    % 4i AbstractInput(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractInput)]))
+        writeFunc('    % 4i AbstractOutput(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractOutput)]))
+        writeFunc('    % 4i AbstractOption(s)\n' % len([obj for obj in objs if isinstance(obj, AbstractOption)]))
+        writeFunc('    % 4i Category(s)\n' % len([obj for obj in objs if isinstance(obj, Category)]))
+
+        if (verbosity == 1):
+            writeFunc('Exported categories:\n')
+        if (verbosity == 2):
+            writeFunc('Exported categories and widgets:\n')
+        if (verbosity == 3):
+            writeFunc('Exported categories, widgets, inputs, outputs and options:\n')
+        indent = 0
+
+        for obj in objs:
+            s = ''
+            if isinstance(obj, Category):
+                indent = str(obj).count('::')
+                s = '% 3i. Category ===== %s =====' % (obj.order, obj)
+            if isinstance(obj, AbstractWidget):
+                s = '    % 3i. AbstractWidget: %s [%s]' % (obj.order, obj.name, obj.action)
+            if isinstance(obj, AbstractInput):
+                s = '        % 3i. AbstractInput: (%s) %s' % (obj.order, obj.short_name, obj.name)
+            if isinstance(obj, AbstractOutput):
+                s = '        % 3i. AbstractOutput: (%s) %s' % (obj.order, obj.short_name, obj.name)
+            if isinstance(obj, AbstractOption):
+                s = '                AbstractOption: %s | %s' % (obj.name, obj.value)
+
+            if isinstance(obj, Category) or (isinstance(obj, AbstractWidget) and verbosity > 1) or verbosity > 2:
+                writeFunc('    ' * indent + s + '\n')
+

workflows/module_importer.py

+from mothra.settings import INSTALLED_APPS
+
+appName = 'workflows'
+
+def get_installed_apps():
+    return [name[len(appName)+1:] for name in INSTALLED_APPS if name.startswith(appName+'.') and len(name)>len(appName)+1]
+
+#Following functions deal with imports of libraries as dicts
+def import_all_packages_libs_as_dict(libName):
+    pckLibs = {}
+    for pck in get_installed_apps():
+        pckLibs[pck] = import_package_lib_as_dict(pck, libName)
+    return pckLibs
+
+def import_package_lib_as_dict(packageName, libName):
+    return dynamic_import_globals_as_dict(appName+"."+packageName + "." + libName, packageName)
+
+def dynamic_import_globals_as_dict(name, package):
+    try:
+        m = __import__(name, globals(), locals(), ['*'])
+    except:
+        return None
+    return m
+
+#Following functions deal with imports of libraries as globals, hovever localSetAttrFunc must be provided - this function should set local global in file where we want import like:
+#def setattr_local(name, value, package):
+#    setattr(sys.modules[__name__], name, value)
+def import_all_packages_libs(libName, localSetAttrFunc):
+    for pck in get_installed_apps():
+        import_package_lib(pck, libName, localSetAttrFunc)
+
+def import_package_lib(packageName, libName, localSetAttrFunc):
+    dynamic_import_globals(appName+"."+packageName + "." + libName, packageName, localSetAttrFunc)
+
+def dynamic_import_globals(name, package, localSetAttrFunc):
+    try:
+        m = __import__(name, globals(), locals(), ['*'])
+    except:
+        return
+    all_names = [name for name in dir(m) if name[0]!='_']
+    g = globals()
+    for name in all_names:
+        #g[name] = m.__dict__.get(name)
+        #print name
+        localSetAttrFunc(name, m.__dict__.get(name), package)

workflows/packageLibImporter.py

-from mothra.settings import INSTALLED_APPS
-
-appName = 'workflows'
-import workflows.library
-
-def getAllInstalledAps():
-    return [name[len(appName)+1:] for name in INSTALLED_APPS if name.startswith(appName+'.') and len(name)>len(appName)+1]
-
-def importAllPackagesLib(libName, localSetattr):
-    for pck in getAllInstalledAps():
-        importPackageLib(pck, libName, localSetattr)
-
-def importPackageLib(packageName, libName, localSetattr):
-    dynamicImportAllGlobals(appName+"."+packageName + "." + libName, packageName, localSetattr)
-
-def dynamicImportAllGlobals(name, package, localSetattr):
-    try:
-        m = __import__(name, globals(), locals(), ['*'])
-    except:
-        return
-    all_names = [name for name in dir(m) if name[0]!='_']
-    g = globals()
-    for name in all_names:
-        #g[name] = m.__dict__.get(name)
-        #print name
-        localSetattr(name, m.__dict__.get(name), package)
-

workflows/urls.py

 from django.conf.urls.defaults import patterns, include, url
 
 packageUrls = {}
-from workflows import packageLibImporter
+from workflows import module_importer
 def set_package_url(name, value, package):
     if name == 'urlpatterns':
         packageUrls[package] = value
-packageLibImporter.importAllPackagesLib("urls",set_package_url)
+module_importer.import_all_packages_libs("urls",set_package_url)
 
 urlpatterns = patterns('',)
 

workflows/visualization_views.py

@@ -5,10 +5,10 @@ import nlp
 from decision_support.visualization import *
 from subgroup_discovery.visualization import *
 
-from workflows import packageLibImporter
+from workflows import module_importer
 def setattr_local(name, value, package):
     setattr(sys.modules[__name__], name, value)
-packageLibImporter.importAllPackagesLib("visualization_views",setattr_local)
+module_importer.import_all_packages_libs("visualization_views",setattr_local)
 
 def odt_to_tab(request,input_dict,output_dict,widget):
     import Orange