Dev

packages/ducpdf/src/duc2pdf/src/builder.rs

@@ -1,6 +1,7 @@
 use crate::scaling::DucDataScaler;
 use crate::streaming::stream_elements::ElementStreamer;
 use crate::streaming::stream_resources::ResourceStreamer;
+use crate::utils::document_pdf::get_renderable_doc_pdf_file_id;
 use crate::utils::freedraw_bounds::{
     calculate_freedraw_bbox, calculate_freedraw_point_bbox, format_number, FreeDrawBounds,
     UNIT_EPSILON as FREEDRAW_EPSILON,
@@ -1726,10 +1727,8 @@ impl DucToPdfBuilder {
                     .file_id
                     .as_ref()
                     .map(|file_id| (file_id.clone(), pdf_elem.base.width, pdf_elem.base.height)),
-                DucElementEnum::DucDocElement(doc_elem) => doc_elem
-                    .file_id
-                    .as_ref()
-                    .map(|file_id| (file_id.clone(), doc_elem.base.width, doc_elem.base.height)),
+                DucElementEnum::DucDocElement(doc_elem) => get_renderable_doc_pdf_file_id(doc_elem)
+                    .map(|file_id| (file_id, doc_elem.base.width, doc_elem.base.height)),
                 _ => None,
             })
             .collect();

packages/ducpdf/src/duc2pdf/src/streaming/stream_elements.rs

@@ -26,6 +26,7 @@
 use crate::scaling::DucDataScaler;
 use crate::streaming::pdf_linear::PdfLinearRenderer;
 use crate::streaming::stream_resources::ResourceStreamer;
+use crate::utils::document_pdf::get_renderable_doc_pdf_file_id;
 use crate::utils::freedraw_bounds::FreeDrawBounds;
 use crate::utils::style_resolver::{ResolvedStyles, StyleResolver};
 use crate::{ConversionError, ConversionResult};
@@ -2995,18 +2996,18 @@ impl ElementStreamer {
         Ok(ops)
     }
 
-    /// Stream DucDocElement as an embedded PDF (compiled from Typst via file_id)
+    /// Stream DucDocElement as its compiled embedded PDF.
     fn stream_doc_element(
         &mut self,
         doc: &DucDocElement,
         document: &mut Document,
         pdf_embedder: &mut PdfEmbedder,
     ) -> ConversionResult<Vec<Operation>> {
-        let file_id = match &doc.file_id {
-            Some(fid) => fid.clone(),
+        let file_id = match get_renderable_doc_pdf_file_id(doc) {
+            Some(fid) => fid,
             None => {
                 return Ok(vec![Operation::new(
-                    "% DucDocElement without file_id",
+                    "% DucDocElement without compiled PDF",
                     vec![],
                 )]);
             }

packages/ducpdf/src/duc2pdf/src/utils/document_pdf.rs

@@ -0,0 +1,60 @@
+use duc::types::DucDocElement;
+
+const DOC_PDF_CACHE_FILE_ID_PREFIX: &str = "doc_pdf_cache_";
+const DOC_TYPST_SOURCE_FILE_ID_PREFIX: &str = "doc_typst_source_";
+
+pub fn get_renderable_doc_pdf_file_id(doc: &DucDocElement) -> Option<String> {
+    resolve_doc_pdf_file_id(
+        &doc.base.id,
+        doc.file_id.as_deref(),
+        &doc.referenced_file_ids,
+    )
+}
+
+fn resolve_doc_pdf_file_id(
+    element_id: &str,
+    file_id: Option<&str>,
+    referenced_file_ids: &[String],
+) -> Option<String> {
+    let cache_id = format!("{}{}", DOC_PDF_CACHE_FILE_ID_PREFIX, element_id);
+    if referenced_file_ids.iter().any(|id| id == &cache_id) {
+        return Some(cache_id);
+    }
+
+    file_id
+        .filter(|id| !id.starts_with(DOC_TYPST_SOURCE_FILE_ID_PREFIX))
+        .map(str::to_owned)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::resolve_doc_pdf_file_id;
+
+    #[test]
+    fn resolves_compiled_pdf_cache_before_typst_source() {
+        assert_eq!(
+            resolve_doc_pdf_file_id(
+                "doc-1",
+                Some("doc_typst_source_doc-1"),
+                &["doc_pdf_cache_doc-1".to_owned()],
+            ),
+            Some("doc_pdf_cache_doc-1".to_owned()),
+        );
+    }
+
+    #[test]
+    fn rejects_uncompiled_typst_source() {
+        assert_eq!(
+            resolve_doc_pdf_file_id("doc-1", Some("doc_typst_source_doc-1"), &[]),
+            None,
+        );
+    }
+
+    #[test]
+    fn keeps_legacy_document_pdf_file_id() {
+        assert_eq!(
+            resolve_doc_pdf_file_id("doc-1", Some("legacy-document.pdf"), &[]),
+            Some("legacy-document.pdf".to_owned()),
+        );
+    }
+}

packages/ducpdf/src/duc2pdf/src/utils/mod.rs

@@ -1,3 +1,4 @@
+pub mod document_pdf;
 pub mod freedraw_bounds;
 pub mod style_resolver;
 pub mod svg_to_pdf;

packages/ducpy/pyproject.toml

@@ -5,6 +5,7 @@ description = "Python library for the .duc project-state format for physical-eng
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
+    "build123d>=0.10.0",
     "certifi>=2025.1.31",
     "nanoid>=2.0.0",
     "pypdf>=5.3.1",
@@ -66,7 +67,6 @@ dev = [
     "rich>=13.0.0",
     "numpy>=1.20.0",
     "typst>=0.14.9",
-    "build123d>=0.10.0",
     "ocp-vscode>=3.4.0",
     "ifcopenshell>=0.8.5",
     "sphinx-llm>=0.4.1",

packages/ducpy/src/ducpy/search/__init__.py

@@ -1,5 +1,22 @@
 """Search helpers for DUC SQLite databases."""
 
+from .search_build123d import (
+    Build123dText,
+    Build123dTextItem,
+    extract_build123d_path_text,
+    extract_build123d_shape_text,
+    extract_build123d_text,
+    extract_model_build123d_text,
+)
+from .search_charter_issues import (
+    DucCharterIssueSearchResponse,
+    DucCharterIssueSearchResult,
+    DucCharterSearchResult,
+    DucIssueSearchResult,
+    search_duc_charter,
+    search_duc_charter_and_issues,
+    search_duc_issues,
+)
 from .search_elements import (
     DucElementSearchResult,
     DucFileSearchResult,
@@ -34,12 +51,18 @@
 )
 
 __all__ = [
+    "DWGDXF_WASM_PATH_ENV",
+    "DWGDXF_WASM_URL",
+    "Build123dText",
+    "Build123dTextItem",
+    "DucCharterIssueSearchResponse",
+    "DucCharterIssueSearchResult",
+    "DucCharterSearchResult",
     "DucElementSearchResult",
     "DucFileSearchResult",
+    "DucIssueSearchResult",
     "DucSearchResponse",
     "DucSearchResult",
-    "DWGDXF_WASM_PATH_ENV",
-    "DWGDXF_WASM_URL",
     "DwgConversionNotAvailable",
     "DxfText",
     "DxfTextItem",
@@ -50,12 +73,19 @@
     "ModelEngine",
     "convert_dwg_to_dxf",
     "detect_model_engine",
+    "extract_build123d_path_text",
+    "extract_build123d_shape_text",
+    "extract_build123d_text",
     "extract_dxf_text",
-    "extract_model_dxf_text",
-    "search_duc_elements",
     "extract_ifc_file_text",
     "extract_ifc_path_text",
     "extract_ifc_text",
+    "extract_model_build123d_text",
+    "extract_model_dxf_text",
     "extract_model_ifc_text",
+    "search_duc_charter",
+    "search_duc_charter_and_issues",
+    "search_duc_elements",
+    "search_duc_issues",
     "search_duc_models",
 ]