Feature guard

Edit RELEASES.md
Edit Readme
2026-08-31 09:25:57 -07:00 · 2023-09-08 13:20:28 +01:00 · 2023-09-08 13:10:19 +01:00 · 2023-09-08 13:05:15 +01:00 · 2023-09-08 13:03:43 +01:00 · 2023-09-08 19:43:13 +08:00
7 changed files with 108 additions and 73 deletions
@@ -3,7 +3,7 @@
 #
 #    maturin generate-ci github
 #
-name: python
+name: CI

 on:
  push:
@@ -16,28 +16,28 @@ permissions:
  contents: read

 jobs:
-  # linux:
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10'
-  #     - name: Build wheels
-  #       uses: PyO3/maturin-action@v1
-  #       with:
-  #         target: ${{ matrix.target }}
-  #         args: -m cmdapp/Cargo.toml --release --lib --features=python-binding --out dist --find-interpreter
-  #         sccache: 'true'
-  #         manylinux: auto
-  #     - name: Upload wheels
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: wheels
-  #         path: dist
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist

  windows:
    runs-on: windows-latest
@@ -54,7 +54,7 @@ jobs:
        uses: PyO3/maturin-action@v1
        with:
          target: ${{ matrix.target }}
-          args: -m cmdapp/Cargo.toml --release --lib --features=python-binding --out dist --find-interpreter
+          args: --release --out dist --find-interpreter
          sccache: 'true'
      - name: Upload wheels
        uses: actions/upload-artifact@v3
@@ -76,7 +76,7 @@ jobs:
        uses: PyO3/maturin-action@v1
        with:
          target: ${{ matrix.target }}
-          args: -m cmdapp/Cargo.toml --release --lib --features=python-binding --out dist --find-interpreter
+          args: --release --out dist --find-interpreter
          sccache: 'true'
      - name: Upload wheels
        uses: actions/upload-artifact@v3
@@ -92,7 +92,7 @@ jobs:
        uses: PyO3/maturin-action@v1
        with:
          command: sdist
-          args: -m cmdapp/Cargo.toml --out dist
+          args: --out dist
      - name: Upload sdist
        uses: actions/upload-artifact@v3
        with:
@@ -102,20 +102,16 @@ jobs:
  release:
    name: Release
    runs-on: ubuntu-latest
-    # Specifying a GitHub environment is optional, but strongly encouraged
-    environment: python
-    permissions:
-      # IMPORTANT: this permission is mandatory for trusted publishing
-      id-token: write
    if: "startsWith(github.ref, 'refs/tags/')"
-    needs: [windows, macos, sdist]
+    needs: [linux, windows, macos, sdist]
    steps:
      - uses: actions/download-artifact@v3
        with:
          name: wheels
      - name: Publish to PyPI
        uses: PyO3/maturin-action@v1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
        with:
          command: upload
          args: --non-interactive --skip-existing *
-          # manylinux: auto
@@ -5,13 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).

-## 0.6.0 - 2023-09-16
+## 0.6.0 - 2023-09-08

-### Python Binding
-
-Thanks to the contribution of [@etjones](https://github.com/etjones), we now have an official Python binding!
-
-https://pypi.org/project/vtracer/0.6.7/
+* Python Binding

 ## 0.5.0 - 2022-10-09

@@ -1,6 +1,6 @@
 [package]
 name = "vtracer"
-version = "0.6.0"
+version = "0.6.3"
 authors = ["Chris Tsang <chris.2y3@outlook.com>"]
 edition = "2021"
 description = "A cmd app to convert images into vector graphics."
@@ -1,6 +1,6 @@
 [project]
 name = "vtracer"
-version = "0.6.10"
+version = "0.6.3"
 description = "Python bindings for the Rust Vtracer raster-to-vector library"
 authors = [ { name = "Chris Tsang",  email = "chris.2y3@outlook.com" } ]
 readme = "vtracer/README.md"
@@ -24,5 +24,5 @@ build-backend = "maturin"

 [tool.maturin]
 features = ["pyo3/extension-module"]
-compatibility = "manylinux2014"
-sdist-include = ["LICENSE-MIT", "vtracer/README.md"]
+compatibility = "linux"
+sdist-include = ["../LICENSE", "../README.md"]
@@ -1,29 +1,28 @@
-use crate::*;
 use pyo3::prelude::*;
-use std::path::PathBuf;
-use visioncortex::PathSimplifyMode;
+
+use visioncortex::{PathSimplifyMode};
+use super::converter::*;

 /// Python binding
 #[pyfunction]
-fn convert_image_to_svg_py(
-    image_path: &str,
-    out_path: &str,
-    colormode: Option<&str>,       // "color" or "binary"
-    hierarchical: Option<&str>,    // "stacked" or "cutout"
-    mode: Option<&str>,            // "polygon", "spline", "none"
-    filter_speckle: Option<usize>, // default: 4
-    color_precision: Option<i32>,  // default: 6
-    layer_difference: Option<i32>, // default: 16
-    corner_threshold: Option<i32>, // default: 60
-    length_threshold: Option<f64>, // in [3.5, 10] default: 4.0
-    max_iterations: Option<usize>, // default: 10
-    splice_threshold: Option<i32>, // default: 45
-    path_precision: Option<u32>,   // default: 8
-) -> PyResult<()> {
+fn convert_image_to_svg_py( image_path: &str, 
+                            out_path: &str,   
+                            colormode: Option<&str>,       // "color" or "binary"
+                            hierarchical: Option<&str>,    // "stacked" or "cutout"
+                            mode: Option<&str>,            // "polygon", "spline", "none"
+                            filter_speckle: Option<usize>, // default: 4
+                            color_precision: Option<i32>,  // default: 6
+                            layer_difference: Option<i32>, // default: 16
+                            corner_threshold: Option<i32>, // default: 60   
+                            length_threshold: Option<f64>, // in [3.5, 10] default: 4.0
+                            max_iterations: Option<usize>, // default: 10
+                            splice_threshold: Option<i32>, // default: 45
+                            path_precision: Option<u32>    // default: 8
+                        ) -> PyResult<()> {
    let input_path = PathBuf::from(image_path);
    let output_path = PathBuf::from(out_path);

-    // TODO: enforce color mode with an enum so that we only
+    // TODO: enforce color mode with an enum so that we only 
    // accept the strings 'color' or 'binary'
    let color_mode = match colormode.unwrap_or("color") {
        "color" => ColorMode::Color,
@@ -36,7 +35,7 @@ fn convert_image_to_svg_py(
        "cutout" => Hierarchical::Cutout,
        _ => Hierarchical::Stacked,
    };
-
+    
    let mode = match mode.unwrap_or("spline") {
        "spline" => PathSimplifyMode::Spline,
        "polygon" => PathSimplifyMode::Polygon,
@@ -44,13 +43,13 @@ fn convert_image_to_svg_py(
        _ => PathSimplifyMode::Spline,
    };

-    let filter_speckle = filter_speckle.unwrap_or(4);
-    let color_precision = color_precision.unwrap_or(6);
-    let layer_difference = layer_difference.unwrap_or(16);
-    let corner_threshold = corner_threshold.unwrap_or(60);
-    let length_threshold = length_threshold.unwrap_or(4.0);
-    let splice_threshold = splice_threshold.unwrap_or(45);
-    let max_iterations = max_iterations.unwrap_or(10);
+    let filter_speckle =    filter_speckle.unwrap_or(4);
+    let color_precision =   color_precision.unwrap_or(6);
+    let layer_difference =  layer_difference.unwrap_or(16);
+    let corner_threshold =  corner_threshold.unwrap_or(60);
+    let length_threshold =  length_threshold.unwrap_or(4.0);
+    let splice_threshold =  splice_threshold.unwrap_or(45);
+    let max_iterations =    max_iterations.unwrap_or(10);

    let config = Config {
        input_path,
@@ -66,9 +65,10 @@ fn convert_image_to_svg_py(
        max_iterations,
        splice_threshold,
        path_precision,
-        ..Default::default()
+        ..Default::default()                
    };

+
    convert_image_to_svg(config).unwrap();
    Ok(())
 }
@@ -78,4 +78,4 @@ fn convert_image_to_svg_py(
 fn vtracer(_py: Python, m: &PyModule) -> PyResult<()> {
    m.add_function(wrap_pyfunction!(convert_image_to_svg_py, m)?)?;
    Ok(())
-}
+}
@@ -34,7 +34,6 @@ impl SvgFile {
 impl fmt::Display for SvgFile {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        writeln!(f, r#"<?xml version="1.0" encoding="UTF-8"?>"#)?;
-        writeln!(f, r#"<!-- Generator: visioncortex VTracer {} -->"#, env!("CARGO_PKG_VERSION"))?;
        writeln!(f,
            r#"<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="{}" height="{}">"#,
            self.width, self.height
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1783.4 441.4" style="enable-background:new 0 0 1783.4 441.4;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#A1FCFE;}
+	.st1{fill:#010357;}
+</style>
+<rect class="st0" width="1783.4" height="441.4"/>
+<g>
+	<path class="st1" d="M61.4,393.2V73.8H250V113H109v100.4h124.2v39.7H109v140.1L61.4,393.2L61.4,393.2z"/>
+	<path class="st1" d="M280,393.2V159.7h45.3v233.5L280,393.2L280,393.2z M330.9,92.4c0-15.5-12.5-28-28-28s-28,12.5-28,28
+		s12.5,28,28,28S330.9,107.9,330.9,92.4z"/>
+	<path class="st1" d="M383.5,338.6V57.9h45.3v278.8c0,21,3.7,26.1,18.7,26.1c6.1,0,11.7-0.5,16.8-1.4v30.4
+		c-9.8,2.8-20.1,4.2-29.9,4.2C400.3,396,383.5,376.9,383.5,338.6z"/>
+	<path class="st1" d="M480.6,275.5c0-78.5,41.6-121.4,110.2-121.4c31.3,0,55.6,9.8,72.9,29.9c17.3,19.6,26.2,45.3,26.2,77.5
+		c0,7-0.5,14.9-1.9,24.3H525.4c0.9,50.9,22.4,76.6,64.4,76.6c31.8,0,53.2-14.5,53.2-42H687c0,48.6-39.7,77.5-97.6,77.5
+		C521.7,397.9,480.6,357.3,480.6,275.5z M645,251.7c-0.9-41.6-19.6-62.1-55.6-62.1c-39.7,0-59.8,24.3-63.5,62.1H645z"/>
+	<path class="st1" d="M720.7,323.2h44.8c1.9,28.5,18.7,38.8,51.8,38.8c28.5,0,46.7-15,46.7-35c0-20.6-16.8-28.5-48.1-36l-13.1-2.8
+		l-14.5-3.7l-12.6-4.2c-6.1-1.9-10.7-3.3-13.1-4.7c-5.1-3.3-17.3-8.9-21.5-14.5c-7.5-8.9-15.4-21.5-14-38.8c0-21,8.4-37.8,25.2-50
+		c17.3-12.1,37.8-18.2,62.1-18.2c55.6,0,91.5,22.4,91.5,72.4h-43c-0.5-26.6-16.8-36.4-49-36.4c-24.3,0-40.6,11.2-40.6,31.3
+		c0,18.7,15.9,25.7,49,33.6l5.6,1.4c10.3,2.3,18.2,4.7,23.3,6.1c5.1,1.4,12.1,4.2,21,8.4c23.8,10.3,34.6,25.7,36.9,56
+		c0,43.4-37.8,71-92.5,71C754.8,397.9,720.7,371.7,720.7,323.2z"/>
+	<path class="st1" d="M964,336.7V192.4h-39.2v-32.7h39.7V94.3h44.8v65.4h64v32.7h-64v143.4c0,17.3,8.9,25.7,26.2,25.7
+		c14.5,0,28-1.9,39.7-5.1v34.6c-13.6,4.2-28,6.1-43.4,6.1C986.9,397,964,375.5,964,336.7z"/>
+	<path class="st1" d="M1095.3,325.5c0-44.8,35-69.6,93.4-69.6h58.4v-20.6c0-28.5-16.8-45.8-50-45.8c-35.5,0-51.8,16.8-51.8,41.6
+		h-43.4c0-44.8,33.2-77.1,95.3-77.1c61.2,0,95.7,30.4,95.7,83.1v92.5c0,26.1,3.7,32.2,17.3,33.6h6.5v29.4
+		c-4.7,1.4-11.7,2.3-21.5,2.3c-26.6,0-41.6-15.9-43.4-41.6c-8.9,23.8-36.4,44.4-74.3,44.4C1127.5,397.9,1095.3,368.5,1095.3,325.5z
+		 M1247.1,297.5v-9.3h-58.4c-32.2,0-48.6,12.6-48.6,37.4c0,22.9,14,36.9,41.6,36.9C1222.3,362.4,1247.1,334.4,1247.1,297.5z"/>
+	<path class="st1" d="M1351.7,395.1V161.6h43.9l0.9,36.4h0.9c11.7-24.8,34.1-40.6,62.1-40.6c8.4,0,15.9,0.9,22.9,3.3v38.8
+		c-7.5-1.4-15.9-1.9-25.7-1.9c-33.2,0-59.3,28-59.3,72.9v124.7H1351.7z"/>
+	<g>
+		<g>
+			<rect x="1549" y="146.5" transform="matrix(0.866 -0.5 0.5 0.866 137.8024 841.2704)" class="st1" width="179.4" height="34"/>
+		</g>
+		<g>
+			<rect x="1621.7" y="73.8" transform="matrix(0.5 -0.866 0.866 0.5 677.7373 1500.9166)" class="st1" width="34" height="179.4"/>
+		</g>
+		<g>
+			<rect x="1621.7" y="73.8" class="st1" width="34" height="179.4"/>
+		</g>
+	</g>
+</g>
+</svg>
Author	SHA1	Message	Date
Chris Tsang	66f6bd98f4	Feature guard	2023-09-08 13:20:28 +01:00
Chris Tsang	59448884cb	Edit RELEASES.md	2023-09-08 13:10:19 +01:00
Chris Tsang	edf1311425	Edit Readme	2023-09-08 13:05:15 +01:00
Chris Tsang	02c844dc7a	Move code around	2023-09-08 13:03:43 +01:00
Evan Jones	c3090ac50b	Python bindings sep 2023 (#52 ) * Added maturin-based Python binding, to be deployed to https://pypi.org/project/vtracer/ * Removed poetry mentions from pyproject.toml, added README_PY.md for use on PYPI * -> v0.6.1 -> moved Python bindings to bottom of converter.rs * - README_PY.md needed to be inside the cmdapp directory to display on PyPi.irg -> v0.6.3	2023-09-08 19:43:13 +08:00