pyodcs 0.2.0__tar.gz → 0.3.0__tar.gz

{pyodcs-0.2.0 → pyodcs-0.3.0}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.3.0
+
+Phase 2 and Phase 3 milestone — full v3.1.0 Canonical Object Model and hardened parsing.
+
+**Breaking changes:**
+
+- Root-level `quality` removed; quality checks belong under `schema[]`
+- Root `extensions` flatten removed; use `customProperties` arrays
+- Required root fields: `version`, `apiVersion`, `kind`, `id`, `status`
+- Unknown root fields are rejected at parse time (`deny_unknown_fields`)
+
+**Added:**
+
+- Typed COM for schema, quality, SLA, servers, team, roles, pricing, support
+- Parse diagnostics with object references and `odcs:unknown-field`
+- Section fixtures and YAML/JSON round-trip tests
+- Upstream `odcs-json-schema-v3.1.0.json` pinned in `tests/fixtures/`
+
 ## 0.2.0
 
 First published release.

{pyodcs-0.2.0 → pyodcs-0.3.0}/Cargo.lock

@@ -305,7 +305,7 @@ dependencies = [
 
 [[package]]
 name = "odcs"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "clap",
  "indexmap",

{pyodcs-0.2.0 → pyodcs-0.3.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "odcs"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 rust-version = "1.75"
 description = "Reference implementation of the Open Data Contract Standard (ODCS)"

{pyodcs-0.2.0 → pyodcs-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyodcs
-Version: 0.2.0
+Version: 0.3.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
@@ -26,9 +26,9 @@ Project-URL: Repository, https://github.com/odcs/odcs
 
 Reference Rust implementation for the [Open Data Contract Standard](https://github.com/bitol-io/open-data-contract-standard).
 
-**Status:** Pre-release skeleton  
+**Status:** Pre-release  
 **Upstream ODCS version:** 3.1.0  
-**Reference implementation:** 0.2.0 (Phase 1 — Skeleton)
+**Reference implementation:** 0.3.0 (Phase 2 & 3 — Canonical Object Model and Parsing)
 
 See [ROADMAP.md](ROADMAP.md) for milestone status.
 

{pyodcs-0.2.0 → pyodcs-0.3.0}/README.md

@@ -2,9 +2,9 @@
 
 Reference Rust implementation for the [Open Data Contract Standard](https://github.com/bitol-io/open-data-contract-standard).
 
-**Status:** Pre-release skeleton  
+**Status:** Pre-release  
 **Upstream ODCS version:** 3.1.0  
-**Reference implementation:** 0.2.0 (Phase 1 — Skeleton)
+**Reference implementation:** 0.3.0 (Phase 2 & 3 — Canonical Object Model and Parsing)
 
 See [ROADMAP.md](ROADMAP.md) for milestone status.
 

{pyodcs-0.2.0 → pyodcs-0.3.0}/ROADMAP.md

@@ -11,8 +11,8 @@ The [upstream ODCS specification](https://github.com/bitol-io/open-data-contract
 | Phase | Name | Focus | Status |
 |-------|------|-------|--------|
 | **1** | [Skeleton](#phase-1--skeleton) | Crate layout, CLI entry point, examples, tests | **Complete** (`0.1.0`) |
-| **2** | [Canonical Object Model](#phase-2--canonical-object-model) | ODCS sections as Rust types | Planned |
-| **3** | [Parsing](#phase-3--parsing) | YAML and JSON parsing with extension preservation | Planned |
+| **2** | [Canonical Object Model](#phase-2--canonical-object-model) | ODCS sections as Rust types | **Complete** (`0.3.0`) |
+| **3** | [Parsing](#phase-3--parsing) | YAML and JSON parsing with diagnostics | **Complete** (`0.3.0`) |
 | **4** | [Diagnostics](#phase-4--diagnostics) | Structured diagnostics aligned with DTCS style | Planned |
 | **5** | [Validation](#phase-5--validation) | Phase-based validation pipeline | Planned |
 | **6** | [CLI](#phase-6--cli) | `validate`, `inspect`, `diagnostics`, `schema`, `version` | Planned |
@@ -56,24 +56,23 @@ Phase 1  Skeleton
 
 ## Phase 2 — Canonical Object Model
 
-Model ODCS sections:
+**Target:** `0.3.0` — **Complete**
 
-- fundamentals
-- schema
-- quality
-- SLA
-- stakeholders
-- team
-- roles
-- servers
-- pricing
-- custom properties
+- [x] Shared types (`StableId`, `Tags`, `CustomProperty`, `AuthoritativeDefinitions`, `ContractDescription`)
+- [x] Root `DataContract` with v3.1.0 required fields
+- [x] `SchemaObject` / `SchemaProperty` with nested quality
+- [x] Section modules: SLA, servers, team (object + legacy array), roles, pricing, support
+- [x] `stakeholders` documented as N/A for v3.1.0
 
 ## Phase 3 — Parsing
 
-- Parse YAML and JSON
-- Preserve unknown extension fields
-- Return structured errors and diagnostics
+**Target:** `0.3.0` — **Complete**
+
+- [x] YAML and JSON parsing via serde
+- [x] Parse helpers (`success` / `failure_from_serde`)
+- [x] Parse diagnostics with paths and unknown-field detection
+- [x] Fixture migration and round-trip tests
+- [x] Upstream JSON Schema reference fixture pinned under `tests/fixtures/`
 
 ## Phase 4 — Diagnostics
 

pyodcs-0.3.0/docs/implementation/model-guide.md

@@ -0,0 +1,35 @@
+# ODCS Canonical Object Model Guide
+
+The root type is [`DataContract`](../../src/model/contract.rs), aligned with upstream ODCS v3.1.0.
+
+## Root document
+
+Required fields: `version`, `apiVersion`, `kind`, `id`, `status`.
+
+Optional sections: `name`, `tenant`, `tags`, `domain`, `description`, `servers`, `schema`, `support`, `price`, `team`, `roles`, `slaProperties`, `authoritativeDefinitions`, `customProperties`, `contractCreatedTs`.
+
+Deprecated fields (parsed but not required): `dataProduct`, `slaDefaultElement`.
+
+Quality rules are nested under `schema[]` objects and properties — not at the contract root.
+
+## Module layout
+
+| Module | Types |
+|--------|-------|
+| `shared` | `StableId`, `Tags`, `CustomProperty`, `AuthoritativeDefinition`, `ContractDescription`, `SchemaElement` |
+| `schema` | `SchemaObject`, `SchemaProperty` |
+| `quality` | `DataQuality`, `DataQualityChecks` |
+| `sla` | `ServiceLevelAgreementProperty` |
+| `servers` | `Server` |
+| `team` | `Team`, `TeamMember`, `TeamDeclaration` |
+| `roles` | `Role` |
+| `pricing` | `Pricing` |
+| `support` | `SupportItem`, `Support` |
+| `relationships` | `RelationshipSchemaLevel`, `RelationshipPropertyLevel` |
+
+## Design rules
+
+- Prefer explicit structs mapped from the upstream JSON Schema.
+- Use `customProperties` arrays for extensions (root `additionalProperties: false`).
+- Separate model types from validation logic.
+- Apply `#[serde(rename_all = "camelCase")]` on document structs.

{pyodcs-0.2.0/tests/fixtures → pyodcs-0.3.0/examples}/minimal.odcs.json

@@ -1,11 +1,14 @@
 {
   "version": "3.1.0",
+  "apiVersion": "v3.1.0",
   "kind": "DataContract",
+  "id": "customer-data-contract",
   "name": "customer_data_contract",
   "status": "draft",
   "schema": [
     {
       "name": "customers",
+      "logicalType": "object",
       "physicalName": "customers",
       "properties": [
         {
@@ -19,15 +22,14 @@
           "logicalType": "string",
           "required": false
         }
+      ],
+      "quality": [
+        {
+          "name": "customer_id_not_null",
+          "type": "library",
+          "metric": "not_null"
+        }
       ]
     }
-  ],
-  "quality": [
-    {
-      "name": "customer_id_not_null",
-      "type": "library",
-      "rule": "not_null",
-      "field": "customer_id"
-    }
   ]
 }

{pyodcs-0.2.0 → pyodcs-0.3.0}/examples/minimal.odcs.yaml

@@ -1,10 +1,13 @@
 version: "3.1.0"
+apiVersion: "v3.1.0"
 kind: "DataContract"
+id: "customer-data-contract"
 name: "customer_data_contract"
 status: "draft"
 
 schema:
   - name: "customers"
+    logicalType: "object"
     physicalName: "customers"
     properties:
       - name: "customer_id"
@@ -14,9 +17,7 @@ schema:
       - name: "email"
         logicalType: "string"
         required: false
-
-quality:
-  - name: "customer_id_not_null"
-    type: "library"
-    rule: "not_null"
-    field: "customer_id"
+    quality:
+      - name: "customer_id_not_null"
+        type: "library"
+        metric: "not_null"

{pyodcs-0.2.0 → pyodcs-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pyodcs"
-version = "0.2.0"
+version = "0.3.0"
 description = "Reference implementation of the Open Data Contract Standard (ODCS)"
 readme = "README.md"
 license = { text = "Apache-2.0" }

{pyodcs-0.2.0 → pyodcs-0.3.0}/python/tests/test_pyodcs.py

@@ -41,7 +41,10 @@ def test_parse_file_repo_example() -> None:
 
 
 def test_validate_result_merges_parse_and_validation_diagnostics() -> None:
-    result = pyodcs.parse(b"version: not-a-version\nkind: wrong\nname: ''\nstatus: draft\n", "yaml")
+    result = pyodcs.parse(
+        b"version: '3.1.0'\napiVersion: v9.9.9\nkind: wrong\nid: ''\nstatus: draft\n",
+        "yaml",
+    )
     report = pyodcs.validate_result(result)
     assert not pyodcs.is_valid(report)
 
@@ -52,3 +55,4 @@ def test_inspect_contract() -> None:
     assert contract is not None
     summary = pyodcs.inspect(contract)
     assert "customer_data_contract" in summary
+    assert "customer-data-contract" in summary

{pyodcs-0.2.0 → pyodcs-0.3.0}/src/cli/mod.rs

@@ -122,12 +122,14 @@ pub fn run(cli: Cli) -> i32 {
             };
             if json {
                 let summary = serde_json::json!({
+                    "id": contract.id,
                     "name": contract.name,
                     "version": contract.version,
+                    "apiVersion": contract.api_version,
                     "kind": contract.kind,
                     "status": contract.status,
                     "schemaCount": contract.schema.len(),
-                    "qualityCount": contract.quality.len(),
+                    "qualityCount": contract.quality_rules().len(),
                 });
                 if let Err(error) = writeln!(
                     io::stdout(),

{pyodcs-0.2.0 → pyodcs-0.3.0}/src/diagnostics/mod.rs

@@ -22,12 +22,14 @@ pub(crate) use builders::{com_error, emit, validation_error};
 #[must_use]
 pub fn inspect_contract(contract: &DataContract) -> String {
     format!(
-        "name: {}\nversion: {}\nkind: {}\nstatus: {}\nschema: {}\nquality: {}\n",
-        contract.name,
+        "id: {}\nname: {}\nversion: {}\napiVersion: {}\nkind: {}\nstatus: {}\nschema: {}\nquality: {}\n",
+        contract.id,
+        contract.name.as_deref().unwrap_or("-"),
         contract.version,
+        contract.api_version,
         contract.kind,
         contract.status,
         contract.schema.len(),
-        contract.quality.len(),
+        contract.quality_rules().len(),
     )
 }

{pyodcs-0.2.0 → pyodcs-0.3.0}/src/lib.rs

@@ -14,8 +14,9 @@
 //!
 //! let yaml = br#"
 //! version: "3.1.0"
+//! apiVersion: "v3.1.0"
 //! kind: "DataContract"
-//! name: "example"
+//! id: "example"
 //! status: "draft"
 //! "#;
 //!

pyodcs-0.3.0/src/model/contract.rs

@@ -0,0 +1,111 @@
+//! Root data contract document.
+
+use serde::{Deserialize, Serialize};
+
+use super::fundamentals::ContractDescription;
+use super::pricing::Pricing;
+use super::quality::DataQuality;
+use super::roles::Role;
+use super::schema::SchemaObject;
+use super::servers::Server;
+use super::shared::{AuthoritativeDefinitions, CustomProperties, Tags};
+use super::sla::ServiceLevelAgreementProperty;
+use super::support::Support;
+use super::team::TeamDeclaration;
+use super::versioning::is_supported_api_version;
+
+/// Supported upstream ODCS document `version` values for this implementation.
+pub const SUPPORTED_ODCS_VERSIONS: &[&str] = &["3.1.0"];
+
+/// An ODCS Data Contract — the canonical root object.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub struct DataContract {
+    /// ODCS document version.
+    pub version: String,
+    /// ODCS API version.
+    pub api_version: String,
+    /// Document kind (typically `DataContract`).
+    pub kind: String,
+    /// Stable contract identifier.
+    pub id: String,
+    /// Contract lifecycle status.
+    pub status: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tenant: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tags: Option<Tags>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub servers: Vec<Server>,
+    /// Deprecated data product name.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub data_product: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub description: Option<ContractDescription>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub domain: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub schema: Vec<SchemaObject>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub support: Option<Support>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub price: Option<Pricing>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub team: Option<TeamDeclaration>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub roles: Vec<Role>,
+    /// Deprecated SLA default element.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub sla_default_element: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub sla_properties: Vec<ServiceLevelAgreementProperty>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub authoritative_definitions: Option<AuthoritativeDefinitions>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub custom_properties: Option<CustomProperties>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub contract_created_ts: Option<String>,
+}
+
+impl DataContract {
+    /// Returns `true` when the document version is supported by this crate.
+    #[must_use]
+    pub fn is_supported_version(&self) -> bool {
+        SUPPORTED_ODCS_VERSIONS.contains(&self.version.as_str())
+    }
+
+    /// Returns `true` when the API version is supported by this crate.
+    #[must_use]
+    pub fn is_supported_api_version(&self) -> bool {
+        is_supported_api_version(&self.api_version)
+    }
+
+    /// Returns all nested quality rules declared on schema objects and properties.
+    #[must_use]
+    pub fn quality_rules(&self) -> Vec<&DataQuality> {
+        let mut rules = Vec::new();
+        for schema in &self.schema {
+            if let Some(ref quality) = schema.quality {
+                rules.extend(quality.iter());
+            }
+            collect_property_quality(&schema.properties, &mut rules);
+        }
+        rules
+    }
+}
+
+fn collect_property_quality<'a>(
+    properties: &'a [super::schema::SchemaProperty],
+    out: &mut Vec<&'a DataQuality>,
+) {
+    for property in properties {
+        if let Some(ref quality) = property.quality {
+            out.extend(quality.iter());
+        }
+        if !property.properties.is_empty() {
+            collect_property_quality(&property.properties, out);
+        }
+    }
+}

pyodcs-0.3.0/src/model/custom.rs

@@ -0,0 +1,3 @@
+//! Custom property types.
+
+pub use super::shared::{CustomProperties, CustomProperty};

pyodcs-0.3.0/src/model/fundamentals.rs

@@ -0,0 +1,3 @@
+//! Document identity and fundamentals helpers.
+
+pub use super::shared::ContractDescription;

pyodcs-0.3.0/src/model/mod.rs

@@ -0,0 +1,36 @@
+//! Canonical Object Model types derived from the upstream ODCS specification.
+
+#![allow(missing_docs)]
+
+mod contract;
+mod custom;
+mod fundamentals;
+mod pricing;
+mod quality;
+mod relationships;
+mod roles;
+mod schema;
+mod servers;
+mod shared;
+mod sla;
+mod stakeholders;
+mod support;
+mod team;
+mod versioning;
+
+pub use contract::{DataContract, SUPPORTED_ODCS_VERSIONS};
+pub use custom::{CustomProperties, CustomProperty};
+pub use fundamentals::ContractDescription;
+pub use pricing::Pricing;
+pub use quality::{DataQuality, DataQualityChecks};
+pub use relationships::{RelationshipEndpoint, RelationshipPropertyLevel, RelationshipSchemaLevel};
+pub use roles::Role;
+pub use schema::{Field, SchemaObject, SchemaProperty};
+pub use servers::Server;
+pub use shared::{
+    AuthoritativeDefinition, AuthoritativeDefinitions, SchemaElement, StableId, Tags,
+};
+pub use sla::ServiceLevelAgreementProperty;
+pub use support::{Support, SupportItem};
+pub use team::{Team, TeamDeclaration, TeamMember};
+pub use versioning::{is_supported_api_version, SUPPORTED_API_VERSIONS};

pyodcs-0.3.0/src/model/pricing.rs

@@ -0,0 +1,19 @@
+//! Pricing types.
+
+use serde::{Deserialize, Serialize};
+
+use super::shared::StableId;
+
+/// Pricing information for a data contract.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Pricing {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub id: Option<StableId>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub price_amount: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub price_currency: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub price_unit: Option<String>,
+}

pyodcs-0.3.0/src/model/quality.rs

@@ -0,0 +1,76 @@
+//! Data quality rule types.
+
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+use super::shared::{AuthoritativeDefinitions, CustomProperties, StableId, Tags};
+
+/// Data quality checks attached to schema objects or properties.
+pub type DataQualityChecks = Vec<DataQuality>;
+
+/// A single data quality rule.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct DataQuality {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub id: Option<StableId>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub authoritative_definitions: Option<AuthoritativeDefinitions>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub business_impact: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub custom_properties: Option<CustomProperties>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub dimension: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub method: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub schedule: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub scheduler: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub severity: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tags: Option<Tags>,
+    /// Quality check type: `text`, `library`, `sql`, or `custom`.
+    #[serde(rename = "type", default, skip_serializing_if = "Option::is_none")]
+    pub rule_type: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub unit: Option<String>,
+    /// Library metric (v3.1.0).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub metric: Option<String>,
+    /// Deprecated library rule name (pre-v3.1 compatibility in documents).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub rule: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub arguments: Option<Value>,
+    /// SQL query for `type: sql` rules.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub query: Option<String>,
+    /// Custom engine for `type: custom` rules.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub engine: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub implementation: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be: Option<Value>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_not_be: Option<Value>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be_greater_than: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be_greater_or_equal_to: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be_less_than: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be_less_or_equal_to: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_be_between: Option<Vec<f64>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub must_not_be_between: Option<Vec<f64>>,
+}

pyodcs-0.3.0/src/model/relationships.rs

@@ -0,0 +1,44 @@
+//! Schema relationship types.
+
+use serde::{Deserialize, Serialize};
+
+use super::shared::CustomProperties;
+
+/// Shared relationship fields.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RelationshipBase {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub relationship_type: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub custom_properties: Option<CustomProperties>,
+}
+
+/// Relationship at schema-object level.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RelationshipSchemaLevel {
+    #[serde(flatten)]
+    pub base: RelationshipBase,
+    pub from: RelationshipEndpoint,
+    pub to: RelationshipEndpoint,
+}
+
+/// Relationship at property level.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RelationshipPropertyLevel {
+    #[serde(flatten)]
+    pub base: RelationshipBase,
+    pub to: RelationshipEndpoint,
+}
+
+/// Relationship endpoint (single column or composite key).
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum RelationshipEndpoint {
+    /// Single column reference.
+    Single(String),
+    /// Composite key reference.
+    Composite(Vec<String>),
+}

pyodcs-0.3.0/src/model/roles.rs

@@ -0,0 +1,24 @@
+//! Role types.
+
+use serde::{Deserialize, Serialize};
+
+use super::shared::{CustomProperties, StableId};
+
+/// IAM role providing access to a dataset.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Role {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub id: Option<StableId>,
+    pub role: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub access: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub first_level_approvers: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub second_level_approvers: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub custom_properties: Option<CustomProperties>,
+}