lkr-dev-cli 0.0.53__tar.gz → 0.0.55__tar.gz

{lkr_dev_cli-0.0.53 → lkr_dev_cli-0.0.55}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.5
 Name: lkr-dev-cli
-Version: 0.0.53
+Version: 0.0.55
 Summary: lkr: a command line interface for looker
 Author: bwebs
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: cryptography>=48.0.1
-Requires-Dist: looker-sdk>=25.10.0
+Requires-Dist: looker-sdk>=26.12.0
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pydash>=8.0.5
 Requires-Dist: questionary>=2.1.0
@@ -17,16 +17,19 @@ Requires-Dist: typer>=0.16.0
 Provides-Extra: all
 Requires-Dist: duckdb>=1.3.1; extra == 'all'
 Requires-Dist: fastapi[standard]>=0.136.3; extra == 'all'
-Requires-Dist: mcp[cli]>=1.27.2; extra == 'all'
-Requires-Dist: pydantic-monty; extra == 'all'
+Requires-Dist: mcp[cli]<2,>=1.27.2; extra == 'all'
+Requires-Dist: pydantic-monty==0.0.23; extra == 'all'
 Requires-Dist: selenium>=4.34.0; extra == 'all'
+Provides-Extra: code-mode
+Requires-Dist: mcp[cli]<2,>=1.27.2; extra == 'code-mode'
+Requires-Dist: pydantic-monty==0.0.23; extra == 'code-mode'
 Provides-Extra: codemode
-Requires-Dist: mcp[cli]>=1.27.2; extra == 'codemode'
-Requires-Dist: pydantic-monty; extra == 'codemode'
+Requires-Dist: mcp[cli]<2,>=1.27.2; extra == 'codemode'
+Requires-Dist: pydantic-monty==0.0.23; extra == 'codemode'
 Provides-Extra: mcp
 Requires-Dist: duckdb>=1.3.1; extra == 'mcp'
 Requires-Dist: fastapi[standard]>=0.136.3; extra == 'mcp'
-Requires-Dist: mcp[cli]>=1.27.2; extra == 'mcp'
+Requires-Dist: mcp[cli]<2,>=1.27.2; extra == 'mcp'
 Provides-Extra: observability
 Requires-Dist: fastapi[standard]>=0.136.3; extra == 'observability'
 Requires-Dist: selenium>=4.34.0; extra == 'observability'

{lkr_dev_cli-0.0.53 → lkr_dev_cli-0.0.55}/lkr/codemode/main.py

@@ -199,34 +199,37 @@ def run_python_code(
             # Fallback to regex if parsing fails
             code = re.sub(r"\bsdk\.([a-zA-Z_][a-zA-Z0-9_]*)\b", r"\1", code)
 
-        m = pydantic_monty.Monty(code)
-        
-        # Use low-level OS stdout capture to ensure any print() statements
-        # in Rust or sub-interpreters don't corrupt the JSON-RPC stream
-        with capture_os_stdout() as cap:
-            result = m.run(external_functions=external_funcs)
-        
-        printed_output = cap.output
-        
-        # m.run() returns the evaluated result of the last expression (which is already a primitive)
-        try:
-            # Use JSON for nice formatting if it's a dict/list
-            if result is not None:
-                if isinstance(result, str):
-                    output = result
+        collector = pydantic_monty.CollectString()
+        with pydantic_monty.Monty() as m, m.checkout() as session:
+            # Use low-level OS stdout capture and CollectString to ensure print() statements
+            # don't corrupt the JSON-RPC stream
+            with capture_os_stdout() as cap:
+                result = session.feed_run(
+                    code,
+                    external_lookup=external_funcs,
+                    print_callback=collector,
+                )
+            printed_output = collector.output or cap.output
+                
+            # session.feed_run() returns the evaluated result of the last expression
+            try:
+                # Use JSON for nice formatting if it's a dict/list
+                if result is not None:
+                    if isinstance(result, str):
+                        output = result
+                    else:
+                        output = json.dumps(result, indent=2, default=str)
                 else:
-                    output = json.dumps(result, indent=2, default=str)
-            else:
-                output = ""
-        except Exception:  # noqa: BLE001
-            output = repr(result)
+                    output = ""
+            except Exception:  # noqa: BLE001
+                output = repr(result)
             
-        if printed_output:
-            return json.dumps({
-                "stdout": printed_output,
-                "result": result
-            }, indent=2, default=str)
-        return output
+            if printed_output:
+                return json.dumps({
+                    "stdout": printed_output,
+                    "result": result
+                }, indent=2, default=str)
+            return output
     except Exception as e:  # noqa: BLE001
         logger.error(f"Error executing Monty: {e}")
         if is_auth_expired(e):