feat: basic ipython support (#353)

crates/cli/Cargo.toml

@@ -26,7 +26,7 @@ uuid = { version = "1.1", features = ["v4", "serde"] }
 tokio = { version = "1", features = ["full"] }
 chrono = { version = "0.4.26", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json", "stream"] }
-futures-util = "0.3.30"
+futures-util = { version = "0.3.30" }
 lazy_static = { version = "1.4.0" }
 indicatif-log-bridge = { version = "0.2.1" }
 colored = { version = "2.0.4" }

crates/cli/src/commands/patterns_list.rs

@@ -5,7 +5,7 @@ use marzano_gritmodule::config::{DefinitionSource, ResolvedGritDefinition};
 use crate::{
     flags::GlobalFormatFlags,
     lister::{list_applyables, Listable},
-    resolver::{resolve_from_flags_or_cwd},
+    resolver::resolve_from_flags_or_cwd,
 };
 
 use super::list::ListArgs;

crates/cli/src/github.rs

@@ -1,12 +1,12 @@
 use crate::analyze::group_checks;
 use crate::ux::CheckResult;
 use anyhow::{Context as _, Result};
+use fs_err::OpenOptions;
 use grit_util::Range;
 use log::info;
 use marzano_core::{api::EnforcementLevel, fs::extract_ranges};
 use marzano_gritmodule::config::ResolvedGritDefinition;
 use marzano_gritmodule::utils::extract_path;
-use fs_err::OpenOptions;
 use std::io::prelude::*;
 
 fn format_level(level: &EnforcementLevel) -> String {

crates/cli/src/result_formatting.rs

@@ -2,6 +2,7 @@ use anyhow::anyhow;
 use colored::Colorize;
 use console::style;
 use core::fmt;
+use fs_err::read_to_string;
 use log::info;
 use marzano_core::api::{
     AllDone, AnalysisLog, CreateFile, DoneFile, FileMatchResult, InputFile, Match, MatchResult,
@@ -10,7 +11,6 @@ use marzano_core::api::{
 use marzano_core::constants::DEFAULT_FILE_NAME;
 use marzano_messenger::output_mode::OutputMode;
 use std::fmt::Display;
-use fs_err::read_to_string;
 use std::{
     io::Write,
     sync::{Arc, Mutex},

crates/cli_bin/fixtures/notebooks/old_nb.ipynb

@@ -0,0 +1,35 @@
+{
+  "cells": [
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "id": "5e3cb542-933d-4bf3-a82b-d9d6395a7832",
+      "metadata": {
+        "tags": []
+      },
+      "outputs": [],
+      "source": ["print(4)\n", "print(\"3\")\n", "print(5)"]
+    }
+  ],
+  "metadata": {
+    "kernelspec": {
+      "display_name": "conda210",
+      "language": "python",
+      "name": "conda210"
+    },
+    "language_info": {
+      "codemirror_mode": {
+        "name": "ipython",
+        "version": 3
+      },
+      "file_extension": ".py",
+      "mimetype": "text/x-python",
+      "name": "python",
+      "nbconvert_exporter": "python",
+      "pygments_lexer": "ipython3",
+      "version": "3.9.16"
+    }
+  },
+  "nbformat": 2,
+  "nbformat_minor": 5
+}

crates/cli_bin/fixtures/notebooks/other_nb.ipynb

@@ -0,0 +1,40 @@
+{
+  "cells": [
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "id": "5e3cb542-933d-4bf3-a82b-d9d6395a7832",
+      "metadata": {
+        "tags": []
+      },
+      "outputs": [],
+      "source": [
+        "import configparser\n",
+        "\n",
+        "config = configparser.ConfigParser()\n",
+        "config.read(\"./secrets.ini\")"
+      ]
+    }
+  ],
+  "metadata": {
+    "kernelspec": {
+      "display_name": "conda210",
+      "language": "python",
+      "name": "conda210"
+    },
+    "language_info": {
+      "codemirror_mode": {
+        "name": "ipython",
+        "version": 3
+      },
+      "file_extension": ".py",
+      "mimetype": "text/x-python",
+      "name": "python",
+      "nbconvert_exporter": "python",
+      "pygments_lexer": "ipython3",
+      "version": "3.9.16"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 5
+}

crates/cli_bin/fixtures/notebooks/pattern.grit

@@ -0,0 +1,11 @@
+language python
+
+or {
+  // Simple replacement
+  `configparser.ConfigParser()` => `FigParser.Fig()`,
+  // Cross-cell references
+  `Tool($args)` => `Fool($args)` where {
+    $program <: contains `from langchain.agents import $_`
+  },
+  `print($x)` => `flint($x)`
+}

crates/cli_bin/fixtures/notebooks/tiny_nb.ipynb

@@ -0,0 +1,39 @@
+{
+  "cells": [
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "id": "5e3cb542-933d-4bf3-a82b-d9d6395a7832",
+      "metadata": {
+        "tags": []
+      },
+      "outputs": [],
+      "source": [
+        "print(4)\n",
+        "print(\"3\")\n",
+        "print(5)"
+      ]
+    }
+  ],
+  "metadata": {
+    "kernelspec": {
+      "display_name": "conda210",
+      "language": "python",
+      "name": "conda210"
+    },
+    "language_info": {
+      "codemirror_mode": {
+        "name": "ipython",
+        "version": 3
+      },
+      "file_extension": ".py",
+      "mimetype": "text/x-python",
+      "name": "python",
+      "nbconvert_exporter": "python",
+      "pygments_lexer": "ipython3",
+      "version": "3.9.16"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 5
+}