pysof 0.2.3__tar.gz → 0.2.5__tar.gz

{pysof-0.2.3 → pysof-0.2.5}/Cargo.toml

@@ -17,8 +17,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = ">=0.29", features = ["extension-module", "generate-import-lib"] }
-helios-sof = { path = "../sof", version = "0.2.3", default-features = false }
-helios-fhir = { path = "../fhir", version = "0.2.3", default-features = false }
+helios-sof = { path = "../sof", version = "0.2.5", default-features = false }
+helios-fhir = { path = "../fhir", version = "0.2.5", default-features = false }
 serde = { workspace = true }
 serde_json = { workspace = true }
 chrono = { version = "0.4", features = ["serde"] }

{pysof-0.2.3 → pysof-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysof
-Version: 0.2.3
+Version: 0.2.5
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{pysof-0.2.3 → pysof-0.2.5}/crates/fhir/Cargo.toml

@@ -24,9 +24,9 @@ xml = ["helios-serde-support/xml"]
 serde = { workspace = true }
 serde_json = { workspace = true, features = ["raw_value"] }
 clap = { version = "4.0", features = ["derive"] }
-helios-fhir-macro = { path = "../fhir-macro", version = "0.2.3" }
-helios-serde-support = { path = "../serde-support", version = "0.2.3" }
-helios-fhirpath-support = { path = "../fhirpath-support", version = "0.2.3" }
+helios-fhir-macro = { path = "../fhir-macro", version = "0.2.5" }
+helios-serde-support = { path = "../serde-support", version = "0.2.5" }
+helios-fhirpath-support = { path = "../fhirpath-support", version = "0.2.5" }
 time = "0.3"
 chrono = { workspace = true }
 # Re-add serde-with-arbitrary-precision, keep macros
@@ -41,7 +41,7 @@ rust_decimal_macros = "1.0"
 
 [build-dependencies]
 reqwest = { version = "0.12", features = ["blocking"] }
-zip = "0.6"
+zip = "9"
 
 [package.metadata.docs.rs]
 all-features = true

{pysof-0.2.3 → pysof-0.2.5}/crates/fhir/build.rs

@@ -175,9 +175,9 @@ fn extract_and_clean(zip_path: &PathBuf, resources_dir: &PathBuf, zip_filename:
     // Extract everything
     for i in 0..archive.len() {
         let mut file = archive.by_index(i).unwrap();
-        let outpath = resources_dir.join(file.mangled_name());
+        let outpath = resources_dir.join(file.mangled_name().unwrap());
 
-        if file.name().ends_with('/') {
+        if file.is_dir() {
             fs::create_dir_all(&outpath).unwrap();
         } else {
             if let Some(p) = outpath.parent() {

{pysof-0.2.3 → pysof-0.2.5}/crates/fhir/src/r4.rs

@@ -165598,6 +165598,15 @@ pub enum ViewDefinitionVersionAlgorithm {
     summary_fields = "id,meta,implicit_rules,modifier_extension,url,identifier,version,version_algorithm,name,title,status,experimental,date,publisher,contact,use_context,jurisdiction,effective_period"
 )]
 pub struct ViewDefinition {
+    /// Canonical of the definition of this additional resource
+    ///
+    /// The versioned canonical URL of the StructureDefinition that defines this
+    /// resource type. Instances of an additional resource - a resource type defined
+    /// outside the core FHIR specification - carry it alongside resourceType.
+    ///
+    /// ## Cardinality: Optional (0..1)
+    #[fhir_serde(rename = "resourceDefinition")]
+    pub resource_definition: Option<Canonical>,
     /// Logical id of this artifact
     ///
     /// The logical id of the resource, as used in the URL for the resource. Once
@@ -190545,6 +190554,7 @@ pub static FIELD_TYPES: &[(&str, &str, &str, bool)] = &[
     ("ViewDefinition", "purpose", "markdown", false),
     ("ViewDefinition", "relatedArtifact", "RelatedArtifact", true),
     ("ViewDefinition", "resource", "code", false),
+    ("ViewDefinition", "resourceDefinition", "canonical", false),
     ("ViewDefinition", "reviewer", "ContactDetail", true),
     ("ViewDefinition", "select", "ViewDefinitionSelect", true),
     ("ViewDefinition", "status", "code", false),

{pysof-0.2.3 → pysof-0.2.5}/crates/fhir/src/r4b.rs

@@ -169276,6 +169276,15 @@ pub enum ViewDefinitionVersionAlgorithm {
     summary_fields = "id,meta,implicit_rules,modifier_extension,url,identifier,version,version_algorithm,name,title,status,experimental,date,publisher,contact,use_context,jurisdiction,effective_period"
 )]
 pub struct ViewDefinition {
+    /// Canonical of the definition of this additional resource
+    ///
+    /// The versioned canonical URL of the StructureDefinition that defines this
+    /// resource type. Instances of an additional resource - a resource type defined
+    /// outside the core FHIR specification - carry it alongside resourceType.
+    ///
+    /// ## Cardinality: Optional (0..1)
+    #[fhir_serde(rename = "resourceDefinition")]
+    pub resource_definition: Option<Canonical>,
     /// Logical id of this artifact
     ///
     /// The logical id of the resource, as used in the URL for the resource. Once
@@ -194576,6 +194585,7 @@ pub static FIELD_TYPES: &[(&str, &str, &str, bool)] = &[
     ("ViewDefinition", "purpose", "markdown", false),
     ("ViewDefinition", "relatedArtifact", "RelatedArtifact", true),
     ("ViewDefinition", "resource", "code", false),
+    ("ViewDefinition", "resourceDefinition", "canonical", false),
     ("ViewDefinition", "reviewer", "ContactDetail", true),
     ("ViewDefinition", "select", "ViewDefinitionSelect", true),
     ("ViewDefinition", "status", "code", false),

{pysof-0.2.3 → pysof-0.2.5}/crates/fhir/src/r5.rs

@@ -212700,6 +212700,15 @@ pub enum ViewDefinitionVersionAlgorithm {
     summary_fields = "id,meta,implicit_rules,modifier_extension,url,identifier,version,version_algorithm,name,title,status,experimental,date,publisher,contact,use_context,jurisdiction,effective_period"
 )]
 pub struct ViewDefinition {
+    /// Canonical of the definition of this additional resource
+    ///
+    /// The versioned canonical URL of the StructureDefinition that defines this
+    /// resource type. Instances of an additional resource - a resource type defined
+    /// outside the core FHIR specification - carry it alongside resourceType.
+    ///
+    /// ## Cardinality: Optional (0..1)
+    #[fhir_serde(rename = "resourceDefinition")]
+    pub resource_definition: Option<Canonical>,
     /// Logical id of this artifact
     ///
     /// The logical id of the resource, as used in the URL for the resource. Once
@@ -244724,6 +244733,7 @@ pub static FIELD_TYPES: &[(&str, &str, &str, bool)] = &[
     ("ViewDefinition", "purpose", "markdown", false),
     ("ViewDefinition", "relatedArtifact", "RelatedArtifact", true),
     ("ViewDefinition", "resource", "code", false),
+    ("ViewDefinition", "resourceDefinition", "canonical", false),
     ("ViewDefinition", "reviewer", "ContactDetail", true),
     ("ViewDefinition", "select", "ViewDefinitionSelect", true),
     ("ViewDefinition", "status", "code", false),