Merge branch 'dev_package_independance' into dev

mothra/settings.py

@@ -4,6 +4,7 @@ import os
 
 PROJECT_DIR = os.path.dirname(__file__)
 PUBLIC_DIR = os.path.join(PROJECT_DIR, 'public')
+BACKUP_DIR = os.path.join(PROJECT_DIR, 'backup')
 
 DEBUG = False
 TEMPLATE_DEBUG = True

workflows/base/settings.py

+import os
+
+# === STANDARD PACKAGE SETTINGS ===
+PACKAGE_ROOT = os.path.dirname(__file__)
+
+# === AUTO IMPORT OPTIONS ===
+#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 = True
+#For auto_import_package_data_replace_option description see the 'replace' option in workflows/import_package command
+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_DB_FILES = [os.path.join(PACKAGE_ROOT,'db/package_data.json')]
+

workflows/interaction_views.py

 import sys
 from django.shortcuts import render
 
-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/import_dotnet.py

 import logging
+import os
 import sys
-from settings import *
+from settings import PACKAGE_ROOT
 
 #------------------------------------------------------------------------------
 # prepare environment for loading latino (Python.net interpreter should be used)
 # see: http://pythonnet.sourceforge.net/
 #------------------------------------------------------------------------------
 
-sys.path.append(package_bin)
+sys.path.append(os.path.join(PACKAGE_ROOT, 'bin'))
 
 try:
-    from LatinoCloudFlows import *
     import System
     import Latino
+    from LatinoClowdFlows import *
 except Exception:
-    logging.warning("LatinoClowdFlows could not be imported! Either there are no Latino dll available or a "\
-                    "wrong interpreter is used. See 'http://pythonnet.sourceforge.net' for interpreter details. "\
-                    "Other functionality (besides latino) will work as .")
+    logging.warning("DotNet assemblies could not be loaded! Probable reasons: missing dlls or wrong interpreter (see http://pythonnet.sourceforge.net). "
+                    "Other functionality of ClowdFlows (besides .Net assemblies) should be OK!")
     pass
 
-logging.basicConfig(format='%(asctime)s %(message)s', level=logging.INFO)
\ No newline at end of file

workflows/latino/management/commands/generate_package.py

-from django.core.management.base import BaseCommand, CommandError
-from workflows.models import Category, AbstractWidget, AbstractInput, AbstractOutput, AbstractOption
-from django.core import serializers
-from collections import Counter
-from optparse import make_option
-from workflows.latino.latino import LatinoCF
-from pprint import pprint
-import sys
-
-class Command(BaseCommand):
-    args = 'file_name'
-    help = 'Export all widgets marked in the c# dll package as widgets to the json file which can be imported to the mothra database'
-
-    def handle(self, *args, **options):
-        if (len(args)<1):
-            raise CommandError('Argument "file_name" is required!')
-
-        try:
-            f = open(args[0], 'w')
-        except:
-            raise CommandError('There was a problem with creating/overwriting given output file')
-
-        self.stdout.write('Creating json representations of widgets, inputs, outputs, options and categories ... ')
-        outstr = LatinoCF.GetJsonDbDefinitions()
-        self.stdout.write('done.\n')
-
-        try:
-            f.write(outstr)
-        except:
-            raise CommandError('There was a problem with writing to the given output file')
-
-        self.stdout.write('Json definitions successfully created. Results written to the file.\n')
\ No newline at end of file