cocoindex 0.1.30__tar.gz → 0.1.32__tar.gz

{cocoindex-0.1.30 → cocoindex-0.1.32}/Cargo.lock

@@ -533,7 +533,7 @@ dependencies = [
 
 [[package]]
 name = "cocoindex"
-version = "0.1.30"
+version = "0.1.32"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -546,7 +546,6 @@ dependencies = [
  "bytes",
  "chrono",
  "config",
- "console-subscriber",
  "const_format",
  "derivative",
  "env_logger",
@@ -649,45 +648,6 @@ dependencies = [
  "yaml-rust2 0.8.1",
 ]
 
-[[package]]
-name = "console-api"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857"
-dependencies = [
- "futures-core",
- "prost",
- "prost-types",
- "tonic",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures-task",
- "hdrhistogram",
- "humantime",
- "hyper-util",
- "prost",
- "prost-types",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -802,15 +762,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.12"
@@ -1328,8 +1279,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1439,19 +1390,6 @@ dependencies = [
  "hashbrown 0.15.2",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "7.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
-dependencies = [
- "base64 0.21.7",
- "byteorder",
- "flate2",
- "nom",
- "num-traits",
-]
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1543,12 +1481,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
-
 [[package]]
 name = "hyper"
 version = "1.6.0"
@@ -2016,15 +1948,6 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matchit"
 version = "0.7.3"
@@ -2822,17 +2745,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -2843,15 +2757,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -3348,15 +3256,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3768,16 +3667,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "time"
 version = "0.3.41"
@@ -4078,22 +3967,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "matchers",
- "once_cell",
- "regex",
- "sharded-slab",
- "thread_local",
- "tracing",
- "tracing-core",
 ]
 
 [[package]]
@@ -4104,7 +3977,7 @@ checksum = "b9ac5ea5e7f2f1700842ec071401010b9c59bf735295f6e9fa079c3dc035b167"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "serde_json",
  "streaming-iterator",
  "tree-sitter-language",
@@ -4476,12 +4349,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

{cocoindex-0.1.30 → cocoindex-0.1.32}/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cocoindex"
 # Version used for local development is always higher than others to take precedence.
 # Will be overridden for specific release versions.
-version = "0.1.30"
+version = "0.1.32"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -52,7 +52,6 @@ itertools = "0.14.0"
 derivative = "2.2.0"
 hex = "0.4.3"
 schemars = "0.8.22"
-console-subscriber = "0.4.1"
 env_logger = "0.11.7"
 reqwest = { version = "0.12.15", default-features = false, features = [
     "json",

{cocoindex-0.1.30 → cocoindex-0.1.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.1.30
+Version: 0.1.32
 Requires-Dist: sentence-transformers>=3.3.1
 Requires-Dist: click>=8.1.8
 Requires-Dist: rich>=14.0.0

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/code_embedding/README.md

@@ -46,7 +46,7 @@ CocoInsight is in Early Access now (Free) 😊 You found us! A quick 3 minute vi
 Run CocoInsight to understand your RAG data pipeline:
 
 ```
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight).

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/code_embedding/pyproject.toml

@@ -3,4 +3,4 @@ name = "code-embedding"
 version = "0.1.0"
 description = "Simple example for cocoindex: build embedding index based on source code."
 requires-python = ">=3.10"
-dependencies = ["cocoindex>=0.1.26", "python-dotenv>=1.0.1"]
+dependencies = ["cocoindex>=0.1.30", "python-dotenv>=1.0.1"]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/docs_to_knowledge_graph/README.md

@@ -66,15 +66,11 @@ I used CocoInsight (Free beta now) to troubleshoot the index generation and unde
 It just connects to your local CocoIndex server, with Zero pipeline data retention. Run following command to start CocoInsight:
 
 ```bash
-python3 main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 And then open the url https://cocoindex.io/cocoinsight. 
 
-```
-python main.py cocoindex server -c https://cocoindex.io
-```
-
 <img width="1430" alt="cocoinsight" src="https://github.com/user-attachments/assets/d5ada581-cceb-42bf-a949-132df674f3dd" />
 
 

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/docs_to_knowledge_graph/pyproject.toml

@@ -3,4 +3,4 @@ name = "manuals-to-kg"
 version = "0.1.0"
 description = "Simple example for cocoindex: extract triples from files and build knowledge graph."
 requires-python = ">=3.10"
-dependencies = ["cocoindex>=0.1.26", "python-dotenv>=1.0.1"]
+dependencies = ["cocoindex>=0.1.30", "python-dotenv>=1.0.1"]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/gdrive_text_embedding/README.md

@@ -53,13 +53,13 @@ CocoInsight is in Early Access now (Free) 😊 You found us! A quick 3 minute vi
 Run CocoInsight to understand your RAG data pipeline:
 
 ```sh
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 You can also add a `-L` flag to make the server keep updating the index to reflect source changes at the same time:
 
 ```sh
-python main.py cocoindex server -c https://cocoindex.io -L
+python main.py cocoindex server -ci -L
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight).

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/gdrive_text_embedding/pyproject.toml

@@ -3,4 +3,4 @@ name = "gdrive-text-embedding"
 version = "0.1.0"
 description = "Simple example for cocoindex: build embedding index based on Google Drive files."
 requires-python = ">=3.11"
-dependencies = ["cocoindex>=0.1.26", "python-dotenv>=1.0.1"]
+dependencies = ["cocoindex>=0.1.30", "python-dotenv>=1.0.1"]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/manuals_llm_extraction/README.md

@@ -65,7 +65,7 @@ CocoInsight is a tool to help you understand your data pipeline and data index.
 Run CocoInsight to understand your RAG data pipeline:
 
 ```
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight). It connects to your local CocoIndex server with zero data retention.

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/manuals_llm_extraction/pyproject.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "Simple example for cocoindex: extract structured information from a Markdown file using LLM."
 requires-python = ">=3.10"
 dependencies = [
-    "cocoindex>=0.1.26",
+    "cocoindex>=0.1.30",
     "python-dotenv>=1.0.1",
     "marker-pdf>=1.5.2",
 ]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/pdf_embedding/README.md

@@ -35,7 +35,7 @@ CocoInsight is in Early Access now (Free) 😊 You found us! A quick 3 minute vi
 Run CocoInsight to understand your RAG data pipeline:
 
 ```
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight).

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/pdf_embedding/pyproject.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "Simple example for cocoindex: build embedding index based on local PDF files."
 requires-python = ">=3.10"
 dependencies = [
-    "cocoindex>=0.1.26",
+    "cocoindex>=0.1.30",
     "python-dotenv>=1.0.1",
     "marker-pdf>=1.5.2",
 ]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/text_embedding/README.md

@@ -39,7 +39,7 @@ CocoInsight is in Early Access now (Free) 😊 You found us! A quick 3 minute vi
 Run CocoInsight to understand your RAG data pipeline:
 
 ```
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight).

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/text_embedding/pyproject.toml

@@ -3,4 +3,4 @@ name = "text-embedding"
 version = "0.1.0"
 description = "Simple example for cocoindex: build embedding index based on local text files."
 requires-python = ">=3.10"
-dependencies = ["cocoindex>=0.1.26", "python-dotenv>=1.0.1"]
+dependencies = ["cocoindex>=0.1.30", "python-dotenv>=1.0.1"]

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/text_embedding_qdrant/README.md

@@ -63,7 +63,7 @@ CocoInsight is in Early Access now (Free) 😊 You found us! A quick 3 minute vi
 Run CocoInsight to understand your RAG data pipeline:
 
 ```bash
-python main.py cocoindex server -c https://cocoindex.io
+python main.py cocoindex server -ci
 ```
 
 Then open the CocoInsight UI at [https://cocoindex.io/cocoinsight](https://cocoindex.io/cocoinsight).

{cocoindex-0.1.30 → cocoindex-0.1.32}/examples/text_embedding_qdrant/pyproject.toml

@@ -3,4 +3,4 @@ name = "text-embedding-qdrant"
 version = "0.1.0"
 description = "Simple example for cocoindex: build embedding index based on local text files."
 requires-python = ">=3.10"
-dependencies = ["cocoindex>=0.1.26", "python-dotenv>=1.0.1"]
+dependencies = ["cocoindex>=0.1.30", "python-dotenv>=1.0.1"]

{cocoindex-0.1.30 → cocoindex-0.1.32}/python/cocoindex/cli.py

@@ -1,7 +1,9 @@
+import asyncio
 import click
 import datetime
 
 from rich.console import Console
+from rich.table import Table
 
 from . import flow, lib, setting
 from .setup import sync_setup, drop_setup, flow_names_with_setup, apply_setup_changes
@@ -56,11 +58,26 @@ def ls(show_all: bool):
 @click.option("--color/--no-color", default=True)
 def show(flow_name: str | None, color: bool):
     """
-    Show the flow spec in a readable format with colored output.
+    Show the flow spec in a readable format with colored output,
+    including the schema.
     """
-    fl = _flow_by_name(flow_name)
+    flow = _flow_by_name(flow_name)
     console = Console(no_color=not color)
-    console.print(fl._render_text())
+    console.print(flow._render_text())
+
+    table = Table(
+        title=f"Schema for Flow: {flow.name}",
+        show_header=True,
+        header_style="bold magenta"
+    )
+    table.add_column("Field", style="cyan")
+    table.add_column("Type", style="green")
+    table.add_column("Attributes", style="yellow")
+
+    for field_name, field_type, attr_str in flow._render_schema():
+        table.add_row(field_name, field_type, attr_str)
+
+    console.print(table)
 
 @cli.command()
 def setup():

{cocoindex-0.1.30 → cocoindex-0.1.32}/python/cocoindex/flow.py

@@ -503,6 +503,9 @@ class Flow:
             return self._format_flow(flow_dict)
         except json.JSONDecodeError:
             return Text(flow_spec_str)
+    
+    def _render_schema(self) -> list[tuple[str, str, str]]:
+        return self._lazy_engine_flow().get_schema()
 
     def __str__(self):
         return str(self._render_text())

{cocoindex-0.1.30 → cocoindex-0.1.32}/python/cocoindex/setting.py

@@ -47,7 +47,7 @@ class ServerSettings:
     """Settings for the cocoindex server."""
 
     # The address to bind the server to.
-    address: str = "127.0.0.1:8080"
+    address: str = "127.0.0.1:49344"
 
     # The origins of the clients (e.g. CocoInsight UI) to allow CORS from.
     cors_origins: list[str] | None = None

{cocoindex-0.1.30 → cocoindex-0.1.32}/src/base/schema.rs

@@ -1,9 +1,7 @@
-use crate::builder::plan::AnalyzedValueMapping;
+use crate::prelude::*;
 
 use super::spec::*;
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
-use std::{collections::BTreeMap, ops::Deref, sync::Arc};
+use crate::builder::plan::AnalyzedValueMapping;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct VectorTypeSchema {
@@ -60,27 +58,26 @@ pub enum BasicValueType {
 impl std::fmt::Display for BasicValueType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            BasicValueType::Bytes => write!(f, "bytes"),
-            BasicValueType::Str => write!(f, "str"),
-            BasicValueType::Bool => write!(f, "bool"),
-            BasicValueType::Int64 => write!(f, "int64"),
-            BasicValueType::Float32 => write!(f, "float32"),
-            BasicValueType::Float64 => write!(f, "float64"),
-            BasicValueType::Range => write!(f, "range"),
-            BasicValueType::Uuid => write!(f, "uuid"),
-            BasicValueType::Date => write!(f, "date"),
-            BasicValueType::Time => write!(f, "time"),
-            BasicValueType::LocalDateTime => write!(f, "local_datetime"),
-            BasicValueType::OffsetDateTime => write!(f, "offset_datetime"),
-            BasicValueType::Json => write!(f, "json"),
-            BasicValueType::Vector(s) => write!(
-                f,
-                "vector({}, {})",
-                s.dimension
-                    .map(|d| d.to_string())
-                    .unwrap_or_else(|| "*".to_string()),
-                s.element_type
-            ),
+            BasicValueType::Bytes => write!(f, "Bytes"),
+            BasicValueType::Str => write!(f, "Str"),
+            BasicValueType::Bool => write!(f, "Bool"),
+            BasicValueType::Int64 => write!(f, "Int64"),
+            BasicValueType::Float32 => write!(f, "Float32"),
+            BasicValueType::Float64 => write!(f, "Float64"),
+            BasicValueType::Range => write!(f, "Range"),
+            BasicValueType::Uuid => write!(f, "Uuid"),
+            BasicValueType::Date => write!(f, "Date"),
+            BasicValueType::Time => write!(f, "Time"),
+            BasicValueType::LocalDateTime => write!(f, "LocalDateTime"),
+            BasicValueType::OffsetDateTime => write!(f, "OffsetDateTime"),
+            BasicValueType::Json => write!(f, "Json"),
+            BasicValueType::Vector(s) => {
+                write!(f, "Vector[{}", s.element_type)?;
+                if let Some(dimension) = s.dimension {
+                    write!(f, ", {}", dimension)?;
+                }
+                write!(f, "]")
+            }
         }
     }
 }
@@ -141,9 +138,6 @@ impl std::fmt::Display for TableKind {
 pub struct TableSchema {
     pub kind: TableKind,
     pub row: StructSchema,
-
-    #[serde(default = "Vec::new", skip_serializing_if = "Vec::is_empty")]
-    pub collectors: Vec<NamedSpec<Arc<CollectorSchema>>>,
 }
 
 impl TableSchema {
@@ -170,36 +164,19 @@ impl TableSchema {
         Self {
             kind: self.kind,
             row: self.row.without_attrs(),
-            collectors: self
-                .collectors
-                .iter()
-                .map(|c| NamedSpec {
-                    name: c.name.clone(),
-                    spec: Arc::from(c.spec.without_attrs()),
-                })
-                .collect(),
         }
     }
 }
 
 impl std::fmt::Display for TableSchema {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}({}", self.kind, self.row)?;
-        for collector in self.collectors.iter() {
-            write!(f, "; COLLECTOR {} ({})", collector.name, collector.spec)?;
-        }
-        write!(f, ")")?;
-        Ok(())
+        write!(f, "{}({})", self.kind, self.row)
     }
 }
 
 impl TableSchema {
     pub fn new(kind: TableKind, row: StructSchema) -> Self {
-        Self {
-            kind,
-            row,
-            collectors: Default::default(),
-        }
+        Self { kind, row }
     }
 
     pub fn key_field(&self) -> Option<&FieldSchema> {
@@ -409,16 +386,27 @@ impl CollectorSchema {
     }
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct OpScopeSchema {
+    /// Output schema for transform ops.
+    pub op_output_types: HashMap<FieldName, EnrichedValueType>,
+
+    /// Child op scope for foreach ops.
+    pub op_scopes: HashMap<String, Arc<OpScopeSchema>>,
+
+    /// Collectors for the current scope.
+    pub collectors: Vec<NamedSpec<Arc<CollectorSchema>>>,
+}
+
 /// Top-level schema for a flow instance.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DataSchema {
+pub struct FlowSchema {
     pub schema: StructSchema,
 
-    #[serde(default = "Vec::new", skip_serializing_if = "Vec::is_empty")]
-    pub collectors: Vec<NamedSpec<Arc<CollectorSchema>>>,
+    pub root_op_scope: OpScopeSchema,
 }
 
-impl Deref for DataSchema {
+impl std::ops::Deref for FlowSchema {
     type Target = StructSchema;
 
     fn deref(&self) -> &Self::Target {

{cocoindex-0.1.30 → cocoindex-0.1.32}/src/builder/analyzed_flow.rs

@@ -9,7 +9,7 @@ use crate::{
 
 pub struct AnalyzedFlow {
     pub flow_instance: spec::FlowInstanceSpec,
-    pub data_schema: schema::DataSchema,
+    pub data_schema: schema::FlowSchema,
     pub desired_state: setup::FlowSetupState<setup::DesiredMode>,
     /// It's None if the flow is not up to date
     pub execution_plan:
@@ -67,7 +67,7 @@ impl AnalyzedFlow {
 
 pub struct AnalyzedTransientFlow {
     pub transient_flow_instance: spec::TransientFlowSpec,
-    pub data_schema: schema::DataSchema,
+    pub data_schema: schema::FlowSchema,
     pub execution_plan: plan::TransientExecutionPlan,
     pub output_type: schema::EnrichedValueType,
 }