Integrate with PSY/IS that supports time series in InfraStore

Project.toml

@@ -11,14 +11,16 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OpenAPI = "d5e62ea6-ddf3-4d43-8e4c-ad5e6c8bfd7d"
 PowerCoreOpenAPIModels = "b7b40286-e793-417d-a9a0-b1583e4da1cb"
+PowerOpenAPIModels = "0730f07c-cff6-4c3b-a9df-c546153be50a"
 PowerOperationsOpenAPIModels = "a372b6d7-45a2-44c2-8199-6a724b72e8ff"
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [sources]
 # These packages are generated and not yet released, so they resolve from the branch
 # rather than the registry. Switch to a tagged rev once one exists.
-PowerCoreOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "jd/openapi_regen", subdir = "PowerCoreOpenAPIModels.jl"}
-PowerOperationsOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "jd/openapi_regen", subdir = "PowerOperationsOpenAPIModels.jl"}
+PowerCoreOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "feat/infrastore-integration", subdir = "PowerCoreOpenAPIModels.jl"}
+PowerOperationsOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "feat/infrastore-integration", subdir = "PowerOperationsOpenAPIModels.jl"}
+InfrastructureSystems = {rev = "feat/infrastore-integration", url = "https://github.com/Sienna-Platform/InfrastructureSystems.jl"}
 
 [compat]
 DataStructures = "0.19.3"
@@ -28,6 +30,7 @@ JSON = "1"
 LinearAlgebra = "1"
 OpenAPI = "0.2"
 PowerCoreOpenAPIModels = "0.1"
+PowerOpenAPIModels = "0.1"
 PowerOperationsOpenAPIModels = "0.1"
 Unicode = "1"
 julia = "^1.10"

docs/Project.toml

@@ -11,8 +11,8 @@ PowerOperationsOpenAPIModels = "a372b6d7-45a2-44c2-8199-6a724b72e8ff"
 # pin them.
 [sources]
 PowerFlowFileParser = {path = ".."}
-PowerCoreOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "jd/openapi_regen", subdir = "PowerCoreOpenAPIModels.jl"}
-PowerOperationsOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "jd/openapi_regen", subdir = "PowerOperationsOpenAPIModels.jl"}
+PowerCoreOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "feat/infrastore-integration", subdir = "PowerCoreOpenAPIModels.jl"}
+PowerOperationsOpenAPIModels = {url = "https://github.com/Sienna-Platform/PowerOpenAPIModels.git", rev = "feat/infrastore-integration", subdir = "PowerOperationsOpenAPIModels.jl"}
 
 [compat]
 julia = "^1.10"

src/PowerFlowFileParser.jl

@@ -20,8 +20,10 @@ import Unicode: normalize
 import JSON
 import OpenAPI
 import PowerCoreOpenAPIModels
+import PowerOpenAPIModels
 import PowerOperationsOpenAPIModels
 const PC = PowerCoreOpenAPIModels
+const PD = PowerOpenAPIModels
 const PO = PowerOperationsOpenAPIModels
 
 import InfrastructureSystems

src/openapi/attributes.jl

@@ -16,7 +16,7 @@
 
 """
 One piecewise-linear curve and control-mode per impedance-correction table number.
-Ported from PSCB's `_impedance_correction_table_lookup` (:213-261), minus the per-winding
+Ported from PSCB's `_impedance_correction_table_lookup`, minus the per-winding
 pre-expansion — [`_attach_impedance_correction!`](@ref) does that lazily, only for
 (table, winding) pairs a transformer actually references.
 """
@@ -78,7 +78,8 @@ function _new_impedance_correction_attribute!(
 end
 
 """
-Attach the `ImpedanceCorrectionData` for `(d[table_key], winding)` to `transformer_id`,
+Attach the `ImpedanceCorrectionData` for `(d[table_key], winding)` to `transformer_id`
+(a `transformer_type` component: `"TwoWindingTransformer"` or `"ThreeWindingTransformer"`),
 if `d[table_key]` names a table `curves` has an entry for. `table_key` absent, or naming
 table `0` (PSS/E's "no correction table" default, per `pti.jl`'s TAB1/TAB2/TAB3
 defaults), is a no-op — matching PSCB's `_attach_single_ict!`, which only ever finds a
@@ -94,6 +95,7 @@ function _attach_impedance_correction!(
     table_key::AbstractString,
     winding::AbstractString,
     transformer_id::Int,
+    transformer_type::AbstractString,
 )
     if isempty(curves) || !haskey(d, table_key)
         return
@@ -105,7 +107,9 @@ function _attach_impedance_correction!(
     key = (table_number, winding)
     if haskey(cache, key)
         # The attribute already exists, so only the association row is new.
-        add_supplemental_attribute_association!(sys, cache[key], transformer_id)
+        add_supplemental_attribute_association!(
+            sys, cache[key], transformer_id, transformer_type,
+        )
     else
         cache[key] =
             _new_impedance_correction_attribute!(sys, curves, table_number, winding,
@@ -142,7 +146,7 @@ function read_substations!(sys::OpenAPISystem, data::Dict; kwargs...)
         set_value!(attribute, :grounding_resistance, d["grounding_resistance"], "ohm")
         add_supplemental_attribute!(sys, attribute, first(bus_ids))
         for bus_id in Iterators.drop(bus_ids, 1)
-            add_supplemental_attribute_association!(sys, attribute, bus_id)
+            add_supplemental_attribute_association!(sys, attribute, bus_id, "ACBus")
         end
     end
     return
@@ -151,7 +155,7 @@ end
 """
 Attach `ImpedanceCorrectionData` supplemental attributes to every `TwoWindingTransformer`/
 `ThreeWindingTransformer` that references an impedance-correction table. Ported from
-PSCB's `_attach_impedance_correction_tables!` (:294-330), but driven by re-walking
+PSCB's `_attach_impedance_correction_tables!`, but driven by re-walking
 `data["branch"]`/`data["3w_transformer"]` rather than called inline from the transformer
 readers — so the name derivation below must match
 [`read_branches!`](@ref)/[`read_3w_transformers!`](@ref) exactly, same formatter kwargs
@@ -179,6 +183,7 @@ function read_impedance_corrections!(sys::OpenAPISystem, data::Dict; kwargs...)
         transformer_id = get_id(reg, "TwoWindingTransformer", name)
         _attach_impedance_correction!(
             sys, cache, curves, d, "correction_table", "TR2W_WINDING", transformer_id,
+            "TwoWindingTransformer",
         )
     end
 
@@ -197,15 +202,15 @@ function read_impedance_corrections!(sys::OpenAPISystem, data::Dict; kwargs...)
         transformer_id = get_id(reg, "ThreeWindingTransformer", name)
         _attach_impedance_correction!(
             sys, cache, curves, d, "primary_correction_table", "PRIMARY_WINDING",
-            transformer_id,
+            transformer_id, "ThreeWindingTransformer",
         )
         _attach_impedance_correction!(
             sys, cache, curves, d, "secondary_correction_table", "SECONDARY_WINDING",
-            transformer_id,
+            transformer_id, "ThreeWindingTransformer",
         )
         _attach_impedance_correction!(
             sys, cache, curves, d, "tertiary_correction_table", "TERTIARY_WINDING",
-            transformer_id,
+            transformer_id, "ThreeWindingTransformer",
         )
     end
     return

src/openapi/branch.jl

@@ -46,15 +46,6 @@ function _get_rating(name::AbstractString, d::Dict, key::AbstractString)
     return d[key]
 end
 
-"""A `_get_rating`-style optional value (`nothing` when the pm dict carries no such key),
-scaled onto the circuit's own `base_power`."""
-function _scaled_or_nothing(value, base_power::Real)
-    if isnothing(value)
-        return nothing
-    end
-    return value * base_power
-end
-
 """Bus name and ISOLATED status by pm bus number. Shared by the branch/transformer/
 dc-line/shunt readers, all of which resolve endpoints by pm bus number rather than by
 document id."""
@@ -267,7 +258,7 @@ function _make_transformer_circuit!(
     set_value!(circuit, :arc, arc_id)
     set_value!(circuit, :tap, get(d, tap_key, 1.0), "1")
     set_value!(circuit, :alpha, d[angle_key], "rad")
-    set_value!(circuit, :parameter_units, "DEVICE_BASE")
+    set_value!(circuit, :parameter_units, "COMPONENT_BASE")
     set_value!(circuit, :r, r, "pu")
     set_value!(circuit, :x, x, "pu")
     _set_transformer_control_fields!(circuit, d, control_suffix, record)
@@ -315,17 +306,17 @@ function make_line!(
     set_value!(line, :b, (from = d["b_fr"], to = d["b_to"]), "pu")
     set_value!(line, :rating, _get_rating(name, d, "rate_a") * sys_mbase, "MVA")
     set_optional_value!(line, :rating_b,
-        _scaled_or_nothing(_get_rating(name, d, "rate_b"), sys_mbase), "MVA")
+        _natural_value(_get_rating(name, d, "rate_b"), sys_mbase), "MVA")
     set_optional_value!(line, :rating_c,
-        _scaled_or_nothing(_get_rating(name, d, "rate_c"), sys_mbase), "MVA")
+        _natural_value(_get_rating(name, d, "rate_c"), sys_mbase), "MVA")
     set_value!(line, :angle_limits, (min = d["angmin"], max = d["angmax"]), "rad")
     add_component!(sys, line)
     set_component_ext!(sys, line, get(d, "ext", Dict{String, Any}()))
     return
 end
 
 """A zero-impedance pm branch, converted to a `DiscreteControlledACBranch` of type
-`SWITCH`. Ported from PSCB's `_make_switch_from_zero_impedance_line` (:1270-1301) — a
+`SWITCH`. Ported from PSCB's `_make_switch_from_zero_impedance_line` — a
 real PSS/E data shape (a modeled switching device recorded as a zero-r/x branch), not one
 of the four named bug-compatible sites."""
 function make_switch_from_zero_impedance_branch!(
@@ -370,7 +361,7 @@ function _branch_type_matpower(d::Dict)
     shift = d["shift"]
     is_transformer = d["transformer"]
     if !is_transformer
-        is_transformer = (tap != 0.0 && tap != 1.0) || shift != 0.0
+        is_transformer = (!iszero(tap) && tap != 1.0) || !iszero(shift)
     end
     if is_transformer
         return :transformer
@@ -385,7 +376,7 @@ function _branch_type_psse(d::Dict, name::AbstractString)
     is_transformer = d["transformer"]
     tap = d["tap"]
     if !is_transformer
-        if tap != 0.0 && tap != 1.0
+        if !iszero(tap) && tap != 1.0
             @warn "Transformer $name has tap ratio $tap, which is not 0.0 or 1.0; this is not a valid value for a Line. Parsing entry as a Transformer"
         else
             return :line
@@ -395,7 +386,7 @@ function _branch_type_psse(d::Dict, name::AbstractString)
 end
 
 """Two-winding transformer + its `TransformerCircuit`. Ported from PSCB's
-`make_transformer_2w` (:1503-1553). See the file header for the rating/flow base
+`make_transformer_2w`. See the file header for the rating/flow base
 (circuit's own `base_power`, not `sys_mbase`) and the magnetizing shunt basis
 (`g_fr`/`b_fr` are already device-base pu for PSS/E-origin data; identical to system base
 for MATPOWER, where `base_power == sys_mbase` unconditionally)."""
@@ -420,9 +411,9 @@ function make_transformer_2w!(
         tap_key = "tap", angle_key = "shift", control_suffix = 1,
         available = available,
         r = d["br_r"], x = d["br_x"],
-        rating = _scaled_or_nothing(rate_a, base_power),
-        rating_b = _scaled_or_nothing(rate_b, base_power),
-        rating_c = _scaled_or_nothing(rate_c, base_power),
+        rating = _natural_value(rate_a, base_power),
+        rating_b = _natural_value(rate_b, base_power),
+        rating_c = _natural_value(rate_c, base_power),
         base_power = base_power,
         base_voltage_primary = _base_voltage_or_nothing(d["base_voltage_from"]),
         base_voltage_secondary = _base_voltage_or_nothing(d["base_voltage_to"]),
@@ -434,7 +425,7 @@ function make_transformer_2w!(
     set_value!(component, :id, register!(reg, "TwoWindingTransformer", name))
     set_value!(component, :name, name)
     set_value!(component, :circuit, circuit_id)
-    set_value!(component, :admittance_units, "DEVICE_BASE")
+    set_value!(component, :admittance_units, "COMPONENT_BASE")
     set_value!(component, :magnetizing_shunt, (real = d["g_fr"], imag = d["b_fr"]), "pu")
     add_component!(sys, component)
     set_component_ext!(sys, component, get(d, "ext", Dict{String, Any}()))
@@ -505,7 +496,7 @@ function make_3w_transformer!(
     set_value!(component, :secondary_circuit, secondary_circuit)
     set_value!(component, :tertiary_circuit, tertiary_circuit)
     set_value!(component, :star_bus, star_id)
-    set_value!(component, :parameter_units, "DEVICE_BASE")
+    set_value!(component, :parameter_units, "COMPONENT_BASE")
     set_value!(component, :r_12, d["r_12"], "pu")
     set_value!(component, :x_12, d["x_12"], "pu")
     set_value!(component, :r_23, d["r_23"], "pu")
@@ -515,7 +506,7 @@ function make_3w_transformer!(
     set_value!(component, :base_power_12, d["base_power_12"], "MVA")
     set_value!(component, :base_power_23, d["base_power_23"], "MVA")
     set_value!(component, :base_power_31, d["base_power_31"], "MVA")
-    set_value!(component, :admittance_units, "DEVICE_BASE")
+    set_value!(component, :admittance_units, "COMPONENT_BASE")
     set_value!(component, :magnetizing_shunt, (real = d["g"], imag = d["b"]), "pu")
     add_component!(sys, component)
     set_component_ext!(sys, component, get(d, "ext", Dict{String, Any}()))
@@ -578,7 +569,7 @@ end
 
 """
 Create one `ThreeWindingTransformer` per `data["3w_transformer"]` entry. Ported from
-PSCB's `read_3w_transformer!` (:1685-1721). `data["3w_transformer"]`'s star bus is a
+PSCB's `read_3w_transformer!`. `data["3w_transformer"]`'s star bus is a
 regular pm dict bus entry (already an `ACBus` by the time this reader runs, via
 `read_bus!`), not created here.
 """

src/openapi/build.jl

@@ -71,7 +71,7 @@ a caller never mistakes a partial document for a complete one.
 
 `unit_system` selects the convention the values are stored in, same as
 [`OpenAPISystem`](@ref): `"NATURAL_UNITS"` (the default) leaves every reader's MW/MVAr/MVA
-values as computed; `"DEVICE_BASE"` additionally runs [`apply_device_base_conversion!`](@ref)
+values as computed; `"COMPONENT_BASE"` additionally runs [`apply_device_base_conversion!`](@ref)
 over the built document, converting every power-family field into per-unit on the
 component's own device base (or the system base, for the few types with none of their own) —
 the document PowerSystems' `DeviceBaseUnit` importer expects. Keyword arguments — the