Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nortech/derivers/handlers/deriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ def visualize_deriver(deriver: Deriver):

for input_name, deriver_input in deriver.inputs.items():
mermaid += f"""
{sha256(deriver.name.encode()).hexdigest()[:8]}_{deriver_input.signal}["{deriver_input.signal}<br/>[{deriver_input.physical_unit.symbol.replace(' ', '')}]"] --> {sha256(deriver_schema_dag.name.encode()).hexdigest()[:8]}_{input_name}
{sha256(deriver.name.encode()).hexdigest()[:8]}_{deriver_input.signal}["{deriver_input.signal}<br/>[{deriver_input.physical_unit.symbol.replace(" ", "")}]"] --> {sha256(deriver_schema_dag.name.encode()).hexdigest()[:8]}_{input_name}
"""

for output_name, deriver_output in deriver.outputs.items():
mermaid += f"""
{sha256(deriver_schema_dag.name.encode()).hexdigest()[:8]}_{output_name} --> {sha256(deriver.name.encode()).hexdigest()[:8]}_{output_name}["{output_name}<br/>[{deriver_output.physical_unit.symbol.replace(' ', '')}]"]
{sha256(deriver_schema_dag.name.encode()).hexdigest()[:8]}_{output_name} --> {sha256(deriver.name.encode()).hexdigest()[:8]}_{output_name}["{output_name}<br/>[{deriver_output.physical_unit.symbol.replace(" ", "")}]"]
"""

mermaid += """
Expand Down
6 changes: 3 additions & 3 deletions nortech/derivers/services/nortech_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ class Schema(BaseModel):


class SchemaDiff(BaseModel):
old: Schema = Field(..., alias="previousSchema")
old: Schema | None = Field(None, alias="previousSchema")
new: Schema = Field(..., alias="newSchema")


class DeriverDiffs(BaseModel):
deriver_schemas: Mapping[str, SchemaDiff] = Field(..., alias="deriverSchemas")
derivers: Mapping[str, SchemaDiff]
deriver_schemas: Mapping[str, SchemaDiff] = Field(..., alias="DeriverSchemas")
derivers: Mapping[str, SchemaDiff] = Field(..., alias="Derivers")

model_config = ConfigDict(populate_by_name=True)

Expand Down
2 changes: 1 addition & 1 deletion nortech/gateways/nortech_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class NortechAPISettings(BaseSettings):

URL: str = Field(default="https://api.apps.nor.tech")
KEY: str = Field(default=...)
USER_AGENT: str = Field(default="nortech-python/0.9.2")
USER_AGENT: str = Field(default="nortech-python/0.9.3")
IGNORE_PAGINATION: bool = True
EXPERIMENTAL_FEATURES: bool = False
TIMEOUT: float | Timeout = Field(default=Timeout(connect=10, read=60))
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "nortech"
version = "0.9.2"
version = "0.9.3"
description = "The official Python library for Nortech AI"
authors = [
{ name = "Nortech AI", email = "info@nortech.ai" }
Expand Down Expand Up @@ -69,6 +69,7 @@ select = [
"W", # PEP 8 warning codes
]
ignore = [
"A005", # Module `signal` shadows a Python standard-library module
"D100", # Missing docstring in public module
"D101", # Missing docstring in public class
"D102", # Missing docstring in public method
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/derivers/test_deriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ def transform_stream(

def test_deriver_deploy(nortech: Nortech, requests_mock: Mocker):
mock_response_data = {
"deriverSchemas": {},
"derivers": {},
"DeriverSchemas": {},
"Derivers": {},
}

requests_mock.post(
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/derivers/test_deriver_diffs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ def test_deriver_diffs():
"updatedAt": datetime(2023, 1, 2),
}
test_deriver_diffs_dict = {
"deriverSchemas": {"schema1": {"previousSchema": test_schema, "newSchema": test_schema}},
"derivers": {"deriver1": {"previousSchema": test_schema, "newSchema": test_schema}},
"DeriverSchemas": {"schema1": {"previousSchema": test_schema, "newSchema": test_schema}},
"Derivers": {"deriver1": {"previousSchema": test_schema, "newSchema": test_schema}},
}

deriver_diffs = DeriverDiffs.model_validate(test_deriver_diffs_dict)

assert deriver_diffs.deriver_schemas["schema1"].old is not None
assert deriver_diffs.deriver_schemas["schema1"].old.id == 123
assert deriver_diffs.deriver_schemas["schema1"].old.hash == "abc123"
assert deriver_diffs.deriver_schemas["schema1"].old.history_id == 456
Expand Down
Loading