clients: snapshot

crates/brk_bindgen/src/generators/python/client.rs

@@ -10,9 +10,8 @@ use brk_types::{pools, Index};
 use serde::Serialize;
 
 use crate::{
-    ClientMetadata, GenericSyntax, IndexSetPattern, PatternField, PythonSyntax,
-    StructuralPattern, VERSION, generate_parameterized_field, generate_tree_path_field,
-    index_to_field_name,
+    ClientMetadata, IndexSetPattern, PythonSyntax, StructuralPattern, VERSION,
+    generate_parameterized_field, generate_tree_path_field, index_to_field_name,
 };
 
 /// Generate class-level constants for the BrkClient class.
@@ -341,13 +340,3 @@ pub fn generate_structural_patterns(
         writeln!(output).unwrap();
     }
 }
-
-/// Get Python type annotation for a field with optional generic value type.
-pub fn field_type_with_generic(
-    field: &PatternField,
-    metadata: &ClientMetadata,
-    is_generic: bool,
-    generic_value_type: Option<&str>,
-) -> String {
-    metadata.field_type_annotation(field, is_generic, generic_value_type, GenericSyntax::PYTHON)
-}

crates/brk_bindgen/src/generators/python/tree.rs

@@ -6,12 +6,10 @@ use std::fmt::Write;
 use brk_types::TreeNode;
 
 use crate::{
-    ClientMetadata, PatternField, PythonSyntax, child_type_name, generate_leaf_field,
+    ClientMetadata, GenericSyntax, PatternField, PythonSyntax, child_type_name, generate_leaf_field,
     get_node_fields, get_pattern_instance_base, prepare_tree_node, to_snake_case,
 };
 
-use super::client::field_type_with_generic;
-
 /// Generate tree classes
 pub fn generate_tree_classes(output: &mut String, catalog: &TreeNode, metadata: &ClientMetadata) {
     writeln!(output, "# Catalog tree classes\n").unwrap();
@@ -54,12 +52,13 @@ fn generate_tree_class(
     for ((field, child_fields_opt), (child_name, child_node)) in
         ctx.fields_with_child_info.iter().zip(ctx.children.iter())
     {
-        // Look up type parameter for generic patterns
-        let generic_value_type = child_fields_opt
-            .as_ref()
-            .and_then(|cf| metadata.get_type_param(cf))
-            .map(String::as_str);
-        let py_type = field_type_with_generic(field, metadata, false, generic_value_type);
+        let py_type = metadata.resolve_tree_field_type(
+            field,
+            child_fields_opt.as_deref(),
+            name,
+            child_name,
+            GenericSyntax::PYTHON,
+        );
         let field_name_py = to_snake_case(&field.name);
 
         if metadata.is_pattern_type(&field.rust_type) && metadata.is_parameterizable(&field.rust_type)