Merge branch 'main' into feat/met-756-improve-ux-for-the-installer

.github/workflows/release.yml

@@ -103,7 +103,7 @@ jobs:
       - uses: dsherret/rust-toolchain-file@v1
         with:
           targets: ${{ matrix.target }}
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - run: |
           # sometimes, dtolnay/rust-toolchain does not select the correct default target
           rustup target add ${{ matrix.target }}
@@ -171,7 +171,7 @@ jobs:
       - uses: WyriHaximus/[email protected]
         id: latest-tag
       - uses: dsherret/rust-toolchain-file@v1
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
       - shell: bash
         env:

.github/workflows/tests.yml

@@ -86,7 +86,7 @@ jobs:
         name: Setup sccache secrets
         run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
       - if: ${{ env.AWS_ACCESS_KEY_ID  != '' }}
-        uses: mozilla-actions/[email protected].5
+        uses: mozilla-actions/[email protected].6
       - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
       - shell: bash
         run: |
@@ -129,7 +129,7 @@ jobs:
         name: Setup sccache secrets
         run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
       - if: ${{ env.AWS_ACCESS_KEY_ID  != '' }}
-        uses: mozilla-actions/[email protected].5
+        uses: mozilla-actions/[email protected].6
       - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
         with:
           # temporary fix
@@ -245,7 +245,7 @@ jobs:
         name: Setup sccache secrets
         run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
       - if: ${{ env.AWS_ACCESS_KEY_ID  != '' }}
-        uses: mozilla-actions/[email protected].5
+        uses: mozilla-actions/[email protected].6
       # - name: Cache deno dir
       #  uses: actions/cache@v4
       #  with:
@@ -314,7 +314,7 @@ jobs:
       # we need secrets for coverage so we skip if not avail
       # this applies to dedpendabot PRs for example
       - if: ${{ env.AWS_ACCESS_KEY_ID  != '' }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.lcov

src/metagen/src/client_py/mod.rs

@@ -210,7 +210,7 @@ class QueryGraph(QueryGraphBase):
             {{"{node_name}": NodeDescs.{meta_method}}}, 
             "$q"
         )[0]
-        return {node_type}(node.node_name, node.instance_name, node.args, node.sub_nodes)
+        return {node_type}(node.node_name, node.instance_name, node.args, node.sub_nodes, node.files)
 "#
         )?;
     }
@@ -280,6 +280,7 @@ fn render_node_metas(
         Rc::new(node_metas::PyNodeMetasRenderer {
             name_mapper,
             named_types: named_types.clone(),
+            input_files: manifest.input_files.clone(),
         }),
     );
     for &id in &manifest.node_metas {

src/metagen/src/client_py/node_metas.rs

@@ -1,16 +1,20 @@
 // Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
 // SPDX-License-Identifier: MPL-2.0
 
-use std::fmt::Write;
+use std::{collections::HashMap, fmt::Write, ops::Not};
 
 use common::typegraph::*;
 
 use super::utils::normalize_type_title;
-use crate::{interlude::*, shared::types::*};
+use crate::{
+    interlude::*,
+    shared::{files::TypePath, types::*},
+};
 
 pub struct PyNodeMetasRenderer {
     pub name_mapper: Rc<super::NameMapper>,
     pub named_types: Rc<std::sync::Mutex<IndexSet<u32>>>,
+    pub input_files: Rc<HashMap<u32, Vec<TypePath>>>,
 }
 
 impl PyNodeMetasRenderer {
@@ -52,6 +56,7 @@ impl PyNodeMetasRenderer {
         ty_name: &str,
         return_node: &str,
         argument_fields: Option<IndexMap<String, Rc<str>>>,
+        input_files: Option<String>,
     ) -> std::fmt::Result {
         write!(
             dest,
@@ -84,6 +89,13 @@ impl PyNodeMetasRenderer {
             }},"#
             )?;
         }
+        if let Some(input_files) = input_files {
+            write!(
+                dest,
+                r#"
+            input_files={input_files},"#
+            )?;
+        }
         write!(
             dest,
             r#"
@@ -172,7 +184,22 @@ impl RenderType for PyNodeMetasRenderer {
                 };
                 let node_name = &base.title;
                 let ty_name = normalize_type_title(node_name).to_pascal_case();
-                self.render_for_func(renderer, &ty_name, &return_ty_name, props)?;
+                let input_files = self
+                    .input_files
+                    .get(&cursor.id)
+                    .map(|files| {
+                        files
+                            .iter()
+                            .map(|path| path.to_vec_str())
+                            .collect::<Vec<_>>()
+                    })
+                    .and_then(|files| {
+                        files
+                            .is_empty()
+                            .not()
+                            .then_some(serde_json::to_string(&files).unwrap())
+                    });
+                self.render_for_func(renderer, &ty_name, &return_ty_name, props, input_files)?;
                 ty_name
             }
             TypeNode::Object { data, base } => {