q2rad 0.1.223__tar.gz → 0.1.224__tar.gz

{q2rad-0.1.223 → q2rad-0.1.224}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.223
+Version: 0.1.224
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.223 → q2rad-0.1.224}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.223"
+version = "0.1.224"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.223 → q2rad-0.1.224}/q2rad/q2rad.py

@@ -1412,13 +1412,14 @@ class Q2RadApp(Q2App):
                 if re.findall(r"^\s*import\W*.*", x):
                     module = x.split("import")[1].strip()
                     if self.db_logic.get("modules", f"name='{module}'", "name"):
-                        x = x.split("import")[0] + f"run_module('{module}', import_only=True)"
+                        # x = x.split("import")[0] + f"run_module('{module}', import_only=True)"
+                        x = x.split("import")[0] + f"run_module('{module}', _globals=globals(), import_only=True)"
 
                 new_script_lines.append(x)
             script = "\n".join(new_script_lines)
         try:
             code = compile(script, f"<{script}>", "exec")
-            return {"code": code, "error": ""}
+            return {"code": code, "error": "", "script": script}
         except Exception:
             error = sys.exc_info()[1]
             msg = []

{q2rad-0.1.223 → q2rad-0.1.224}/q2rad/q2reports.py

@@ -26,13 +26,18 @@ from q2rad.q2queries import Q2QueryEdit
 from q2rad.q2utils import q2cursor, Q2_save_and_run
 from q2gui import q2app
 from q2gui.q2dialogs import Q2WaitShow, q2WaitMax, q2WaitStep, q2working
+from q2rad.q2raddb import *
+from q2rad.q2utils import *
 import json
 import os
+import logging
+import threading
 import gettext
 
 from q2rad.q2utils import Q2Form
 
 _ = gettext.gettext
+_logger = logging.getLogger(__name__)
 
 # TODO: selected rows removing - bug
 
@@ -190,6 +195,10 @@ class Q2RadReport(Q2Report):
         q2app.q2_app.process_events()
 
     def run(self, output_file="temp/repo.html"):
+        from q2rad.q2rad import run_module, run_form, get_form , get_report
+        _globals = {}
+        _globals.update(locals())
+
         output_file = self.prepare_output_file(output_file)
         if not output_file:
             return
@@ -214,6 +223,27 @@ class Q2RadReport(Q2Report):
 
             return real_worker
 
+        if _module := self.report_content.get("module"):
+            code = q2app.q2_app.code_compiler(_module)
+            if code["code"]:
+                _globals.update(globals())
+                try:
+                    exec(code["code"], _globals)
+                    for key, value in _globals.items():
+                        self.set_data(value, key)
+                except Exception as error:
+                    from q2rad.q2rad import explain_error
+                    _logger.error(f"{error}")
+                    explain_error()
+            else:
+                msg = code["error"]
+                if threading.current_thread() is threading.main_thread():
+                    q2mess(f"{msg}".replace("\n", "<br>").replace(" ", "&nbsp;"))
+                print(f"{msg}")
+                print("-" * 25)
+                _logger.error(msg)
+                return
+
         q2working(worker(), "W o r k i n g")
 
         super().run(output_file, data=data)
@@ -364,8 +394,8 @@ class Q2ReportEdit(Q2Form):
         self.add_control("rl", "", widget=self.layout_edit, nogrid=1, migrate=0)
         self.add_control("/t", "Query")
         self.add_control("ql", "", widget=self.query_edit, nogrid=1, migrate=0)
-        self.add_control("/t", "Setup")
-        self.add_control("before_script", "", control="code")
+        # self.add_control("/t", "Setup")
+        # self.add_control("before_script", "", control="code")
         self.add_control("/t", "Module")
         self.add_control("module", "", control="code")
         self.add_control("/t", "Comment")
@@ -380,10 +410,12 @@ class Q2ReportEdit(Q2Form):
             content_json = content
         self.query_edit.set_content(content_json)
         self.layout_edit.set_content(content_json)
+        self.s.module = content_json.get("module", "#")
 
     def get_content(self, str_mode=True):
         content = self.query_edit.get_content(str_mode=False)
         content.update(self.layout_edit.get_content(str_mode=False))
+        content["module"] = self.s.module
         if str_mode:
             return json.dumps(content, indent=2)
         else:

{q2rad-0.1.223 → q2rad-0.1.224}/q2rad/q2utils.py

@@ -204,6 +204,7 @@ class Q2Form(_Q2Form):
                 q2app.q2app.ACTION_TOOLS_TEXT + "|" + "Changelog",
                 self.changelog,
                 icon="🕟",
+                eof_disabled=1,
             )
 
     def changelog(self):

q2rad-0.1.224/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.224"

q2rad-0.1.223/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.223"