ducpy 3.2.1__tar.gz → 3.2.3__tar.gz

{ducpy-3.2.1 → ducpy-3.2.3}/Cargo.lock

@@ -390,6 +390,7 @@ dependencies = [
  "js-sys",
  "log",
  "serde",
+ "serde-wasm-bindgen",
  "serde_json",
  "svg2pdf",
  "svgtypes 0.12.0",
@@ -411,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "ducpy-native"
-version = "3.2.1"
+version = "3.2.3"
 dependencies = [
  "duc",
  "pyo3",
@@ -1366,9 +1367,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
+checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -1384,9 +1385,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
+checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1394,9 +1395,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
+checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1404,9 +1405,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
+checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1416,9 +1417,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
+checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1429,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "pythonize"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a6ee7a084f913f98d70cdc3ebec07e852b735ae3059a1500db2661265da9ff"
+checksum = "d5bcac0d0b71821f0d69e42654f1e15e5c94b85196446c4de9588951a2117e7b"
 dependencies = [
  "pyo3",
  "serde",
@@ -1945,9 +1946,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "termcolor"

{ducpy-3.2.1 → ducpy-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducpy
-Version: 3.2.1
+Version: 3.2.3
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: nanoid>=2.0.0
 License-File: LICENSE

{ducpy-3.2.1 → ducpy-3.2.3}/packages/ducpy/crate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ducpy-native"
-version = "3.2.1"
+version = "3.2.3"
 edition = "2021"
 description = "Python native extension for the duc file format (used by ducpy)"
 publish = false
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 duc = { path = "../../ducrs" }
-pyo3 = { version = "0.23", features = ["extension-module"] }
-pythonize = "0.23"
+pyo3 = { version = "0.24.1", features = ["extension-module"] }
+pythonize = "0.24"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

ducpy-3.2.3/packages/ducrs/src/lib.rs

@@ -0,0 +1,12 @@
+#[allow(unused_imports)]
+#[allow(non_camel_case_types)]
+#[allow(non_snake_case)]
+#[allow(non_upper_case_globals)]
+pub mod parse;
+pub mod serde_utils;
+pub mod serialize;
+pub mod types;
+
+// SQLite storage layer and high-level document API
+pub mod db;
+pub mod api;

{ducpy-3.2.1 → ducpy-3.2.3}/packages/ducrs/src/parse.rs

@@ -1374,23 +1374,23 @@ fn read_binding_from_row(row: &rusqlite::Row, offset: usize) -> rusqlite::Result
     let elem_id: Option<String> = row.get(offset)?;
     let Some(element_id) = elem_id else { return Ok(None) };
 
-    let fixed_x: Option<f64> = row.get(offset + 4)?;
+    let fixed_x: Option<f64> = row.get(offset + 3)?;
     let fixed_point = fixed_x.map(|x| GeometricPoint {
         x,
-        y: row.get::<_, f64>(offset + 5).unwrap_or(0.0),
+        y: row.get::<_, f64>(offset + 4).unwrap_or(0.0),
     });
 
-    let pt_idx: Option<i32> = row.get(offset + 6)?;
+    let pt_idx: Option<i32> = row.get(offset + 5)?;
     let point = pt_idx.map(|index| PointBindingPoint {
         index,
-        offset: row.get::<_, f64>(offset + 7).unwrap_or(0.0),
+        offset: row.get::<_, f64>(offset + 6).unwrap_or(0.0),
     });
 
-    let head_type: Option<i32> = row.get(offset + 8)?;
+    let head_type: Option<i32> = row.get(offset + 7)?;
     let head = head_type.map(|ht| DucHead {
         head_type: Some(int_to_line_head(ht)),
-        block_id: row.get::<_, Option<String>>(offset + 9).unwrap_or(None),
-        size: row.get::<_, f64>(offset + 10).unwrap_or(1.0),
+        block_id: row.get::<_, Option<String>>(offset + 8).unwrap_or(None),
+        size: row.get::<_, f64>(offset + 9).unwrap_or(1.0),
     });
 
     Ok(Some(DucPointBinding {
@@ -1506,10 +1506,10 @@ fn read_table_element(conn: &Connection, base: DucElementBase) -> ParseResult<Du
 fn read_model_element(conn: &Connection, base: DucElementBase) -> ParseResult<DucElementEnum> {
     let id = base.id.clone();
     let mut stmt = conn.prepare_cached(
-        "SELECT model_type, code, svg_path FROM element_model WHERE element_id = ?1"
+        "SELECT model_type, code, thumbnail FROM element_model WHERE element_id = ?1"
     )?;
-    let (model_type, code, svg_path) = stmt.query_row(params![id], |row| {
-        Ok((row.get::<_, Option<String>>(0)?, row.get::<_, Option<String>>(1)?, row.get::<_, Option<String>>(2)?))
+    let (model_type, code, thumbnail) = stmt.query_row(params![id], |row| {
+        Ok((row.get::<_, Option<String>>(0)?, row.get::<_, Option<String>>(1)?, row.get::<_, Option<Vec<u8>>>(2)?))
     })?;
 
     let mut f_stmt = conn.prepare_cached(
@@ -1521,7 +1521,7 @@ fn read_model_element(conn: &Connection, base: DucElementBase) -> ParseResult<Du
     let viewer_state = read_model_viewer_state(conn, &id)?;
 
     Ok(DucElementEnum::DucModelElement(DucModelElement {
-        base, model_type, code, svg_path, file_ids, viewer_state,
+        base, model_type, code, thumbnail, file_ids, viewer_state,
     }))
 }
 

{ducpy-3.2.1 → ducpy-3.2.3}/packages/ducrs/src/serialize.rs

@@ -829,9 +829,9 @@ fn write_document_grid_config(
 
 fn write_model_element(tx: &Transaction, e: &DucModelElement) -> SerializeResult<()> {
     tx.execute(
-        "INSERT INTO element_model (element_id, model_type, code, svg_path)
+        "INSERT INTO element_model (element_id, model_type, code, thumbnail)
          VALUES (?1, ?2, ?3, ?4)",
-        params![e.base.id, e.model_type, e.code, e.svg_path],
+        params![e.base.id, e.model_type, e.code, e.thumbnail],
     )?;
 
     {

{ducpy-3.2.1 → ducpy-3.2.3}/packages/ducrs/src/types.rs

@@ -1185,8 +1185,9 @@ pub struct DucModelElement {
     pub model_type: Option<String>,
     /** Defines the source code of the model using build123d python code */
     pub code: Option<String>,
-    /** The last known SVG path representation of the 3D model for quick rendering on the canvas */
-    pub svg_path: Option<String>,
+    /** The last known image thumbnail of the 3D model for quick rendering on the canvas */
+    #[serde(with = "serde_bytes", default, skip_serializing_if = "Option::is_none")]
+    pub thumbnail: Option<Vec<u8>>,
     /** Possibly connected external files, such as STEP, STL, DXF, etc. */
     pub file_ids: Vec<String>,
     /** The last known 3D viewer state for the model */

ducpy-3.2.3/packages/ducrs/sst-env.d.ts

@@ -0,0 +1,10 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+/* biome-ignore-all lint: auto-generated */
+
+/// <reference path="../../sst-env.d.ts" />
+
+import "sst"
+export {}