tflows 0.0.7__tar.gz → 0.0.9.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tflows
-Version: 0.0.7
+Version: 0.0.9.dev0
 Summary: A lightweight automation and Discord bot framework that lets you build bots using a simple scripting system.
 Author: Tonie
 License: MIT

{tflows-0.0.7 → tflows-0.0.9.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tflows"
-version = "0.0.7"
+version = "0.0.9.dev0"
 description = "A lightweight automation and Discord bot framework that lets you build bots using a simple scripting system."
 readme = "README.md"
 requires-python = ">=3.10"

tflows-0.0.9.dev0/tflows/engine.py

@@ -0,0 +1,220 @@
+import re
+import asyncio
+
+# -----------------------
+# LOG PATTERN (SAFE)
+# -----------------------
+LOG_PATTERN = re.compile(r"\$log\((\d+)\)\{([\s\S]*?)\}")
+
+
+class Engine:
+    def __init__(self, registry):
+        self.registry = registry
+
+    # -----------------------
+    # VARIABLES
+    # -----------------------
+    async def replace_vars(self, ctx, text: str):
+
+        if "$ping" in text:
+            try:
+                latency = ctx._state._get_client().latency * 1000
+                text = text.replace("$ping", f"{latency:.2f}ms")
+            except:
+                pass
+
+        async def var_replacer(match):
+            name = match.group(1)
+            args = match.group(2) or ""
+
+            handler = self.registry.get_var(name)
+            if handler:
+                result = handler(ctx, args)
+
+                if asyncio.iscoroutine(result):
+                    result = await result
+
+                return str(result)
+
+            return match.group(0)
+
+        pattern = r"\$(\w+)(?:\((.*?)\))?"
+        matches = list(re.finditer(pattern, text, re.DOTALL))
+
+        for match in reversed(matches):
+            try:
+                replacement = await var_replacer(match)
+                start, end = match.span()
+                text = text[:start] + replacement + text[end:]
+            except:
+                continue
+
+        return text
+
+    # -----------------------
+    # SAFE LOG SYSTEM (QUEUE STYLE, NON-BLOCKING)
+    # -----------------------
+    async def handle_log(self, ctx, text: str):
+        matches = list(LOG_PATTERN.finditer(text))
+        if not matches:
+            return text
+
+        bot = getattr(ctx, "bot", None) or getattr(self.registry, "bot", None)
+
+        if bot is None:
+            print("[tflow] ERROR: bot not found")
+            return text
+
+        for match in matches:
+            channel_id = match.group(1)
+            message = match.group(2)
+
+            channel = bot.get_channel(int(channel_id))
+
+            if channel is None:
+                try:
+                    channel = await bot.fetch_channel(int(channel_id))
+                except:
+                    continue
+
+            if channel is None:
+                continue
+
+            try:
+                message = await self.replace_vars(ctx, message)
+            except:
+                pass
+
+            try:
+                await channel.send(message)
+                print(f"[tflow] log sent -> {channel_id}")
+            except Exception as e:
+                print("[tflow] send failed:", e)
+
+            text = text.replace(match.group(0), "")
+
+        return text.strip()
+
+    # -----------------------
+    # EMBED PARSER
+    # -----------------------
+    async def parse_embed(self, ctx, block: str):
+
+        import discord
+
+        e = discord.Embed()
+        block = block.replace("\r\n", "\n")
+
+        def grab(key):
+            m = re.search(rf"\${key}\[(.*?)\]", block, re.DOTALL)
+            return m.group(1).strip() if m else None
+
+        title = grab("title")
+        desc = grab("desc")
+        footer = grab("footer")
+        color = grab("color")
+
+        clean = re.sub(
+            r"\$(title|desc|footer|color)\[.*?\]",
+            "",
+            block,
+            flags=re.DOTALL
+        ).strip()
+
+        async def apply(v):
+            if not v:
+                return None
+            return await self.replace_vars(ctx, v)
+
+        if title:
+            e.title = await apply(title)
+
+        full_desc = desc if desc else clean
+        e.description = await self.replace_vars(ctx, full_desc or "No content")
+
+        if footer:
+            e.set_footer(text=await apply(footer))
+
+        if color:
+            try:
+                c = color.replace("#", "").lower()
+                e.color = discord.Color.white() if c == "white" else discord.Color(int(c, 16))
+            except:
+                pass
+
+        await ctx.channel.send(embed=e)
+
+    # -----------------------
+    # MAIN ENGINE (FULLY STABLE FLOW)
+    # -----------------------
+    async def run(self, ctx, code: str):
+
+        lines = code.split("\n")
+        i = 0
+
+        while i < len(lines):
+            line = lines[i].strip()
+
+            i += 1  # prevent infinite loop edge cases early
+
+            if not line:
+                continue
+
+            # -----------------------
+            # EMBED BLOCK
+            # -----------------------
+            if line == "embed":
+                block = []
+
+                while i < len(lines):
+                    if lines[i].strip() == "endembed":
+                        i += 1
+                        break
+                    block.append(lines[i])
+                    i += 1
+
+                await self.parse_embed(ctx, "\n".join(block))
+                continue
+
+            # -----------------------
+            # STEP 1: VARIABLES
+            # -----------------------
+            try:
+                line = await self.replace_vars(ctx, line)
+            except:
+                continue
+
+            # -----------------------
+            # STEP 2: LOG SYSTEM (SAFE SIDE EFFECT)
+            # -----------------------
+            try:
+                line = await self.handle_log(ctx, line)
+            except:
+                pass
+
+            # IMPORTANT: skip empty results (THIS fixes your crash)
+            if not line or not line.strip():
+                continue
+
+            # -----------------------
+            # STEP 3: REGISTRY FUNCTIONS
+            # -----------------------
+            parts = line.split(" ", 1)
+            name = parts[0].strip()
+            args = parts[1] if len(parts) > 1 else ""
+
+            if not name:
+                continue
+
+            func = self.registry.get(name)
+
+            if func:
+                try:
+                    result = func(ctx, args)
+
+                    if asyncio.iscoroutine(result):
+                        await result
+                except Exception as e:
+                    print(f"[tflow] function error: {name} -> {e}")
+            else:
+                print(f"[tflow] Unknown function: {name}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tflows
-Version: 0.0.7
+Version: 0.0.9.dev0
 Summary: A lightweight automation and Discord bot framework that lets you build bots using a simple scripting system.
 Author: Tonie
 License: MIT

tflows-0.0.7/tflows/engine.py

@@ -1,172 +0,0 @@
-import re
-import asyncio
-
-class Engine:
-    def __init__(self, registry):
-        self.registry = registry
-
-    # -----------------------
-    # VARIABLES (FIXED)
-    # -----------------------
-    async def replace_vars(self, ctx, text: str):
-
-        # $ping (keep simple)
-        if "$ping" in text:
-            latency = ctx._state._get_client().latency * 1000
-            text = text.replace("$ping", f"{latency:.2f}ms")
-
-        async def var_replacer(match):
-            name = match.group(1)
-            args = match.group(2) or ""
-
-            handler = self.registry.get_var(name)
-            if handler:
-                result = handler(ctx, args)
-
-                # ✅ SUPPORT ASYNC NOW
-                if asyncio.iscoroutine(result):
-                    result = await result
-
-                return str(result)
-
-            return match.group(0)
-
-        # IMPORTANT: async replace loop
-        pattern = r"\$(\w+)(?:\((.*?)\))?"
-        matches = list(re.finditer(pattern, text, re.DOTALL))
-
-        for match in reversed(matches):
-            replacement = await var_replacer(match)
-            start, end = match.span()
-            text = text[:start] + replacement + text[end:]
-
-        return text
-
-    # -----------------------
-    # EMBED PARSER
-    # -----------------------
-    async def parse_embed(self, ctx, block: str):
-
-        import discord
-        import re
-
-        e = discord.Embed()
-        block = block.replace("\r\n", "\n")
-
-        # -----------------------
-        # EXTRACT HELPERS
-        # -----------------------
-        def grab(key):
-            m = re.search(rf"\${key}\[(.*?)\]", block, re.DOTALL)
-            return m.group(1).strip() if m else None
-
-        title = grab("title")
-        desc = grab("desc")
-        footer = grab("footer")
-        color = grab("color")
-
-        clean = re.sub(
-            r"\$(title|desc|footer|color)\[.*?\]",
-            "",
-            block,
-            flags=re.DOTALL
-        ).strip()
-
-        # -----------------------
-        # SAFE APPLY (ALWAYS AWAIT VAR ENGINE)
-        # -----------------------
-        async def apply(v):
-            if not v:
-                return None
-            return await self.replace_vars(ctx, v)
-
-        # -----------------------
-        # TITLE
-        # -----------------------
-        if title:
-            e.title = await apply(title)
-
-        # -----------------------
-        # DESCRIPTION
-        # -----------------------
-        full_desc = desc if desc else clean
-        e.description = await self.replace_vars(ctx, full_desc or "No content")
-
-        # -----------------------
-        # FOOTER
-        # -----------------------
-        if footer:
-            e.set_footer(text=await apply(footer))
-
-        # -----------------------
-        # COLOR
-        # -----------------------
-        if color:
-            try:
-                c = color.replace("#", "").lower()
-
-                if c == "white":
-                    e.color = discord.Color.white()
-                else:
-                    e.color = discord.Color(int(c, 16))
-
-            except Exception:
-                pass
-
-        # -----------------------
-        # SEND
-        # -----------------------
-        await ctx.channel.send(embed=e)
-
-    # -----------------------
-    # MAIN ENGINE
-    # -----------------------
-    async def run(self, ctx, code: str):
-
-        lines = code.split("\n")
-        i = 0
-
-        while i < len(lines):
-            line = lines[i].strip()
-
-            if not line:
-                i += 1
-                continue
-
-            # -----------------------
-            # EMBED BLOCK
-            # -----------------------
-            if line == "embed":
-                i += 1
-                block = []
-
-                while i < len(lines):
-                    if lines[i].strip() == "endembed":
-                        break
-                    block.append(lines[i])
-                    i += 1
-
-                await self.parse_embed(ctx, "\n".join(block))
-                i += 1
-                continue
-
-            # -----------------------
-            # NORMAL FUNCTIONS
-            # -----------------------
-            line = await self.replace_vars(ctx, line)
-
-            parts = line.split(" ", 1)
-            name = parts[0]
-            args = parts[1] if len(parts) > 1 else ""
-
-            func = self.registry.get(name)
-
-            if func:
-                result = func(ctx, args)
-
-                if asyncio.iscoroutine(result):
-                    await result
-            else:
-                print(f"[tflow] Unknown function: {name}")
-
-            i += 1