Compare commits
44 Commits
lab1_shmul
...
lab5/koval
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a81434cb6 | ||
|
|
a52da042ef | ||
|
|
11c590cf25 | ||
|
|
550d29c48c | ||
|
|
8a1327b10a | ||
|
|
db1b7cc6fc | ||
|
|
a899ef6a6e | ||
|
|
95176ea467 | ||
|
|
081a2d4240 | ||
|
|
92c20ef612 | ||
|
|
c31363aa57 | ||
|
|
87df394352 | ||
|
|
10ad9774a7 | ||
|
|
b730dbb74c | ||
|
|
e4e585b9ac | ||
|
|
185b0aae58 | ||
|
|
af94c007a2 | ||
|
|
f9ef916331 | ||
|
|
3931fa58c1 | ||
|
|
98fb6aa12a | ||
|
|
7ddfb68b02 | ||
| 9473c5a621 | |||
| 953b0bdb9a | |||
|
|
ea9be3fb57 | ||
|
|
f3512e4afb | ||
| f58596ebf7 | |||
| d621390f51 | |||
| e4be6b0a19 | |||
| fe66df9b8c | |||
|
|
69e679eccf | ||
| 3e0b4762ef | |||
| 75613fd4fc | |||
| a25fbfc3ef | |||
| ca790e7306 | |||
| 1643767094 | |||
| 3d94bf3008 | |||
| c5d98d53cd | |||
| 07a0e906d8 | |||
|
|
9bf3741f32 | ||
| c974ac32f6 | |||
|
|
184098b826 | ||
|
|
b2c7427af0 | ||
| 1e7516fe7b | |||
| a63864bcaa |
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
agent/docker/mosquitto/data/
|
||||
agent/docker/mosquitto/log/
|
||||
|
||||
.idea/
|
||||
3
.idea/.gitignore
generated
vendored
Normal file
3
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
15
.idea/IoT-Systems.iml
generated
Normal file
15
.idea/IoT-Systems.iml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/store" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.12 (IoT-Systems)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
<option name="format" value="PLAIN" />
|
||||
<option name="myDocStringFormat" value="Plain" />
|
||||
</component>
|
||||
</module>
|
||||
425
.idea/dbnavigator.xml
generated
Normal file
425
.idea/dbnavigator.xml
generated
Normal file
@@ -0,0 +1,425 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DBNavigator.Project.DDLFileAttachmentManager">
|
||||
<mappings />
|
||||
<preferences />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseAssistantManager">
|
||||
<assistants />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseFileManager">
|
||||
<open-files />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.Settings">
|
||||
<connections />
|
||||
<browser-settings>
|
||||
<general>
|
||||
<display-mode value="TABBED" />
|
||||
<navigation-history-size value="100" />
|
||||
<show-object-details value="false" />
|
||||
<enable-sticky-paths value="true" />
|
||||
</general>
|
||||
<filters>
|
||||
<object-type-filter>
|
||||
<object-type name="SCHEMA" enabled="true" />
|
||||
<object-type name="USER" enabled="true" />
|
||||
<object-type name="ROLE" enabled="true" />
|
||||
<object-type name="PRIVILEGE" enabled="true" />
|
||||
<object-type name="CHARSET" enabled="true" />
|
||||
<object-type name="TABLE" enabled="true" />
|
||||
<object-type name="VIEW" enabled="true" />
|
||||
<object-type name="MATERIALIZED_VIEW" enabled="true" />
|
||||
<object-type name="NESTED_TABLE" enabled="true" />
|
||||
<object-type name="COLUMN" enabled="true" />
|
||||
<object-type name="INDEX" enabled="true" />
|
||||
<object-type name="CONSTRAINT" enabled="true" />
|
||||
<object-type name="DATASET_TRIGGER" enabled="true" />
|
||||
<object-type name="DATABASE_TRIGGER" enabled="true" />
|
||||
<object-type name="SYNONYM" enabled="true" />
|
||||
<object-type name="SEQUENCE" enabled="true" />
|
||||
<object-type name="PROCEDURE" enabled="true" />
|
||||
<object-type name="FUNCTION" enabled="true" />
|
||||
<object-type name="PACKAGE" enabled="true" />
|
||||
<object-type name="TYPE" enabled="true" />
|
||||
<object-type name="TYPE_ATTRIBUTE" enabled="true" />
|
||||
<object-type name="ARGUMENT" enabled="true" />
|
||||
<object-type name="JAVA_CLASS" enabled="true" />
|
||||
<object-type name="JAVA_INNER_CLASS" enabled="true" />
|
||||
<object-type name="JAVA_FIELD" enabled="true" />
|
||||
<object-type name="JAVA_METHOD" enabled="true" />
|
||||
<object-type name="DIMENSION" enabled="true" />
|
||||
<object-type name="CLUSTER" enabled="true" />
|
||||
<object-type name="DBLINK" enabled="true" />
|
||||
<object-type name="CREDENTIAL" enabled="true" />
|
||||
<object-type name="AI_PROFILE" enabled="true" />
|
||||
</object-type-filter>
|
||||
</filters>
|
||||
<sorting>
|
||||
<object-type name="COLUMN" sorting-type="NAME" />
|
||||
<object-type name="FUNCTION" sorting-type="NAME" />
|
||||
<object-type name="PROCEDURE" sorting-type="NAME" />
|
||||
<object-type name="ARGUMENT" sorting-type="POSITION" />
|
||||
<object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
|
||||
</sorting>
|
||||
<default-editors>
|
||||
<object-type name="VIEW" editor-type="SELECTION" />
|
||||
<object-type name="PACKAGE" editor-type="SELECTION" />
|
||||
<object-type name="TYPE" editor-type="SELECTION" />
|
||||
</default-editors>
|
||||
</browser-settings>
|
||||
<navigation-settings>
|
||||
<lookup-filters>
|
||||
<lookup-objects>
|
||||
<object-type name="SCHEMA" enabled="true" />
|
||||
<object-type name="USER" enabled="false" />
|
||||
<object-type name="ROLE" enabled="false" />
|
||||
<object-type name="PRIVILEGE" enabled="false" />
|
||||
<object-type name="CHARSET" enabled="false" />
|
||||
<object-type name="TABLE" enabled="true" />
|
||||
<object-type name="VIEW" enabled="true" />
|
||||
<object-type name="MATERIALIZED VIEW" enabled="true" />
|
||||
<object-type name="INDEX" enabled="true" />
|
||||
<object-type name="CONSTRAINT" enabled="true" />
|
||||
<object-type name="DATASET TRIGGER" enabled="true" />
|
||||
<object-type name="DATABASE TRIGGER" enabled="true" />
|
||||
<object-type name="SYNONYM" enabled="false" />
|
||||
<object-type name="SEQUENCE" enabled="true" />
|
||||
<object-type name="PROCEDURE" enabled="true" />
|
||||
<object-type name="FUNCTION" enabled="true" />
|
||||
<object-type name="PACKAGE" enabled="true" />
|
||||
<object-type name="TYPE" enabled="true" />
|
||||
<object-type name="JAVA CLASS" enabled="true" />
|
||||
<object-type name="INNER CLASS" enabled="true" />
|
||||
<object-type name="JAVA FIELD" enabled="true" />
|
||||
<object-type name="JAVA METHOD" enabled="true" />
|
||||
<object-type name="JAVA PARAMETER" enabled="true" />
|
||||
<object-type name="DIMENSION" enabled="false" />
|
||||
<object-type name="CLUSTER" enabled="false" />
|
||||
<object-type name="DBLINK" enabled="false" />
|
||||
<object-type name="CREDENTIAL" enabled="false" />
|
||||
</lookup-objects>
|
||||
<force-database-load value="false" />
|
||||
<prompt-connection-selection value="true" />
|
||||
<prompt-schema-selection value="true" />
|
||||
</lookup-filters>
|
||||
</navigation-settings>
|
||||
<dataset-grid-settings>
|
||||
<general>
|
||||
<enable-zooming value="true" />
|
||||
<enable-column-tooltip value="true" />
|
||||
</general>
|
||||
<sorting>
|
||||
<nulls-first value="true" />
|
||||
<max-sorting-columns value="4" />
|
||||
</sorting>
|
||||
<audit-columns>
|
||||
<column-names value="" />
|
||||
<visible value="true" />
|
||||
<editable value="false" />
|
||||
</audit-columns>
|
||||
</dataset-grid-settings>
|
||||
<dataset-editor-settings>
|
||||
<text-editor-popup>
|
||||
<active value="false" />
|
||||
<active-if-empty value="false" />
|
||||
<data-length-threshold value="100" />
|
||||
<popup-delay value="1000" />
|
||||
</text-editor-popup>
|
||||
<values-actions-popup>
|
||||
<show-popup-button value="true" />
|
||||
<element-count-threshold value="1000" />
|
||||
<data-length-threshold value="250" />
|
||||
</values-actions-popup>
|
||||
<general>
|
||||
<fetch-block-size value="100" />
|
||||
<fetch-timeout value="30" />
|
||||
<trim-whitespaces value="true" />
|
||||
<convert-empty-strings-to-null value="true" />
|
||||
<select-content-on-cell-edit value="true" />
|
||||
<large-value-preview-active value="true" />
|
||||
</general>
|
||||
<filters>
|
||||
<prompt-filter-dialog value="true" />
|
||||
<default-filter-type value="BASIC" />
|
||||
</filters>
|
||||
<qualified-text-editor text-length-threshold="300">
|
||||
<content-types>
|
||||
<content-type name="Text" enabled="true" />
|
||||
<content-type name="Properties" enabled="true" />
|
||||
<content-type name="XML" enabled="true" />
|
||||
<content-type name="DTD" enabled="true" />
|
||||
<content-type name="HTML" enabled="true" />
|
||||
<content-type name="XHTML" enabled="true" />
|
||||
<content-type name="SQL" enabled="true" />
|
||||
<content-type name="PL/SQL" enabled="true" />
|
||||
<content-type name="JSON" enabled="true" />
|
||||
<content-type name="JSON5" enabled="true" />
|
||||
<content-type name="YAML" enabled="true" />
|
||||
</content-types>
|
||||
</qualified-text-editor>
|
||||
<record-navigation>
|
||||
<navigation-target value="VIEWER" />
|
||||
</record-navigation>
|
||||
</dataset-editor-settings>
|
||||
<code-editor-settings>
|
||||
<general>
|
||||
<show-object-navigation-gutter value="false" />
|
||||
<show-spec-declaration-navigation-gutter value="true" />
|
||||
<enable-spellchecking value="true" />
|
||||
<enable-reference-spellchecking value="false" />
|
||||
</general>
|
||||
<confirmations>
|
||||
<save-changes value="false" />
|
||||
<revert-changes value="true" />
|
||||
<exit-on-changes value="ASK" />
|
||||
</confirmations>
|
||||
</code-editor-settings>
|
||||
<code-completion-settings>
|
||||
<filters>
|
||||
<basic-filter>
|
||||
<filter-element type="RESERVED_WORD" id="keyword" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="function" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="parameter" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="datatype" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="exception" selected="true" />
|
||||
<filter-element type="OBJECT" id="schema" selected="true" />
|
||||
<filter-element type="OBJECT" id="role" selected="true" />
|
||||
<filter-element type="OBJECT" id="user" selected="true" />
|
||||
<filter-element type="OBJECT" id="privilege" selected="true" />
|
||||
<user-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="false" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</user-schema>
|
||||
<public-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="false" />
|
||||
<filter-element type="OBJECT" id="view" selected="false" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="false" />
|
||||
<filter-element type="OBJECT" id="index" selected="false" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="false" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="false" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="false" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="false" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="false" />
|
||||
<filter-element type="OBJECT" id="function" selected="false" />
|
||||
<filter-element type="OBJECT" id="package" selected="false" />
|
||||
<filter-element type="OBJECT" id="type" selected="false" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="false" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="false" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="false" />
|
||||
</public-schema>
|
||||
<any-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</any-schema>
|
||||
</basic-filter>
|
||||
<extended-filter>
|
||||
<filter-element type="RESERVED_WORD" id="keyword" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="function" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="parameter" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="datatype" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="exception" selected="true" />
|
||||
<filter-element type="OBJECT" id="schema" selected="true" />
|
||||
<filter-element type="OBJECT" id="user" selected="true" />
|
||||
<filter-element type="OBJECT" id="role" selected="true" />
|
||||
<filter-element type="OBJECT" id="privilege" selected="true" />
|
||||
<user-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</user-schema>
|
||||
<public-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</public-schema>
|
||||
<any-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</any-schema>
|
||||
</extended-filter>
|
||||
</filters>
|
||||
<sorting enabled="true">
|
||||
<sorting-element type="RESERVED_WORD" id="keyword" />
|
||||
<sorting-element type="RESERVED_WORD" id="datatype" />
|
||||
<sorting-element type="OBJECT" id="column" />
|
||||
<sorting-element type="OBJECT" id="table" />
|
||||
<sorting-element type="OBJECT" id="view" />
|
||||
<sorting-element type="OBJECT" id="materialized view" />
|
||||
<sorting-element type="OBJECT" id="index" />
|
||||
<sorting-element type="OBJECT" id="constraint" />
|
||||
<sorting-element type="OBJECT" id="trigger" />
|
||||
<sorting-element type="OBJECT" id="synonym" />
|
||||
<sorting-element type="OBJECT" id="sequence" />
|
||||
<sorting-element type="OBJECT" id="procedure" />
|
||||
<sorting-element type="OBJECT" id="function" />
|
||||
<sorting-element type="OBJECT" id="package" />
|
||||
<sorting-element type="OBJECT" id="type" />
|
||||
<sorting-element type="OBJECT" id="dimension" />
|
||||
<sorting-element type="OBJECT" id="cluster" />
|
||||
<sorting-element type="OBJECT" id="dblink" />
|
||||
<sorting-element type="OBJECT" id="schema" />
|
||||
<sorting-element type="OBJECT" id="role" />
|
||||
<sorting-element type="OBJECT" id="user" />
|
||||
<sorting-element type="RESERVED_WORD" id="function" />
|
||||
<sorting-element type="RESERVED_WORD" id="parameter" />
|
||||
</sorting>
|
||||
<format>
|
||||
<enforce-code-style-case value="true" />
|
||||
</format>
|
||||
</code-completion-settings>
|
||||
<execution-engine-settings>
|
||||
<statement-execution>
|
||||
<fetch-block-size value="100" />
|
||||
<execution-timeout value="20" />
|
||||
<debug-execution-timeout value="600" />
|
||||
<focus-result value="false" />
|
||||
<prompt-execution value="false" />
|
||||
</statement-execution>
|
||||
<script-execution>
|
||||
<command-line-interfaces />
|
||||
<execution-timeout value="300" />
|
||||
</script-execution>
|
||||
<method-execution>
|
||||
<execution-timeout value="30" />
|
||||
<debug-execution-timeout value="600" />
|
||||
<parameter-history-size value="10" />
|
||||
</method-execution>
|
||||
</execution-engine-settings>
|
||||
<operation-settings>
|
||||
<transactions>
|
||||
<uncommitted-changes>
|
||||
<on-project-close value="ASK" />
|
||||
<on-disconnect value="ASK" />
|
||||
<on-autocommit-toggle value="ASK" />
|
||||
</uncommitted-changes>
|
||||
<multiple-uncommitted-changes>
|
||||
<on-commit value="ASK" />
|
||||
<on-rollback value="ASK" />
|
||||
</multiple-uncommitted-changes>
|
||||
</transactions>
|
||||
<session-browser>
|
||||
<disconnect-session value="ASK" />
|
||||
<kill-session value="ASK" />
|
||||
<reload-on-filter-change value="false" />
|
||||
</session-browser>
|
||||
<compiler>
|
||||
<compile-type value="KEEP" />
|
||||
<compile-dependencies value="ASK" />
|
||||
<always-show-controls value="false" />
|
||||
</compiler>
|
||||
</operation-settings>
|
||||
<ddl-file-settings>
|
||||
<extensions>
|
||||
<mapping file-type-id="VIEW" extensions="vw" />
|
||||
<mapping file-type-id="TRIGGER" extensions="trg" />
|
||||
<mapping file-type-id="PROCEDURE" extensions="prc" />
|
||||
<mapping file-type-id="FUNCTION" extensions="fnc" />
|
||||
<mapping file-type-id="PACKAGE" extensions="pkg" />
|
||||
<mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
|
||||
<mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
|
||||
<mapping file-type-id="TYPE" extensions="tpe" />
|
||||
<mapping file-type-id="TYPE_SPEC" extensions="tps" />
|
||||
<mapping file-type-id="TYPE_BODY" extensions="tpb" />
|
||||
<mapping file-type-id="JAVA_SOURCE" extensions="sql" />
|
||||
</extensions>
|
||||
<general>
|
||||
<lookup-ddl-files value="true" />
|
||||
<create-ddl-files value="false" />
|
||||
<synchronize-ddl-files value="true" />
|
||||
<use-qualified-names value="false" />
|
||||
<make-scripts-rerunnable value="true" />
|
||||
</general>
|
||||
</ddl-file-settings>
|
||||
<assistant-settings>
|
||||
<credential-settings>
|
||||
<credentials />
|
||||
</credential-settings>
|
||||
</assistant-settings>
|
||||
<general-settings>
|
||||
<regional-settings>
|
||||
<date-format value="MEDIUM" />
|
||||
<number-format value="UNGROUPED" />
|
||||
<locale value="SYSTEM_DEFAULT" />
|
||||
<use-custom-formats value="false" />
|
||||
</regional-settings>
|
||||
<environment>
|
||||
<environment-types>
|
||||
<environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
|
||||
<environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
|
||||
<environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
|
||||
<environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
|
||||
</environment-types>
|
||||
<visibility-settings>
|
||||
<connection-tabs value="true" />
|
||||
<dialog-headers value="true" />
|
||||
<object-editor-tabs value="true" />
|
||||
<script-editor-tabs value="false" />
|
||||
<execution-result-tabs value="true" />
|
||||
</visibility-settings>
|
||||
</environment>
|
||||
</general-settings>
|
||||
</component>
|
||||
</project>
|
||||
16
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
16
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@@ -0,0 +1,16 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="PyInterpreterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoredPackages">
|
||||
<value>
|
||||
<list size="2">
|
||||
<item index="0" class="java.lang.String" itemvalue="requests" />
|
||||
<item index="1" class="java.lang.String" itemvalue="python-telegram-bot" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
6
.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
6
.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
7
.idea/misc.xml
generated
Normal file
7
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.12 (IoT-Systems)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (IoT-Systems)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/IoT-Systems.iml" filepath="$PROJECT_DIR$/.idea/IoT-Systems.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
1423
MapView/data.csv
1423
MapView/data.csv
File diff suppressed because one or more lines are too long
7
MapView/domain/accelerometer.py
Normal file
7
MapView/domain/accelerometer.py
Normal file
@@ -0,0 +1,7 @@
|
||||
from dataclasses import dataclass
|
||||
|
||||
@dataclass
|
||||
class Accelerometer:
|
||||
x: int
|
||||
y: int
|
||||
z: int
|
||||
50
MapView/fileReader.py
Normal file
50
MapView/fileReader.py
Normal file
@@ -0,0 +1,50 @@
|
||||
from csv import reader
|
||||
import config
|
||||
from domain.accelerometer import Accelerometer
|
||||
|
||||
|
||||
|
||||
class FileReader:
|
||||
def __init__(
|
||||
self, data_filename: str,
|
||||
) -> None:
|
||||
self.file_path = data_filename
|
||||
pass
|
||||
|
||||
def read(self):
|
||||
return self.getNextValue()
|
||||
|
||||
def startReading(self, *args, **kwargs):
|
||||
self.file = open(self.file_path, newline='')
|
||||
self.file_reader = reader(self.file, skipinitialspace=True)
|
||||
file_header = next(self.file_reader)
|
||||
|
||||
self.x_idx = file_header.index('X')
|
||||
self.y_idx = file_header.index('Y')
|
||||
self.z_idx = file_header.index('Z')
|
||||
|
||||
def getNextValue(self):
|
||||
while True:
|
||||
row = next(self.file_reader, None)
|
||||
if row is None:
|
||||
self._rewind_file()
|
||||
continue
|
||||
try:
|
||||
x = int(row[self.x_idx])
|
||||
y = int(row[self.y_idx])
|
||||
z = int(row[self.z_idx])
|
||||
return Accelerometer(x=x, y=y, z=z)
|
||||
except Exception as e:
|
||||
continue
|
||||
|
||||
def _rewind_file(self):
|
||||
self.file.seek(0)
|
||||
self.file_reader = reader(self.file)
|
||||
next(self.file_reader)
|
||||
|
||||
def stopReading(self, *args, **kwargs):
|
||||
if self.file:
|
||||
self.file.close()
|
||||
self.file_reader = None
|
||||
|
||||
|
||||
0
agent/src/__init__.py
Normal file
0
agent/src/__init__.py
Normal file
22
agent/src/data/parking.csv
Normal file
22
agent/src/data/parking.csv
Normal file
@@ -0,0 +1,22 @@
|
||||
longitude,latitude,empty_count
|
||||
50.450386085935094,30.524547100067142,10
|
||||
50.450386085935094,30.524547100067142,11
|
||||
50.450386085935094,30.524547100067142,13
|
||||
50.450386085935094,30.524547100067142,15
|
||||
50.450386085935094,30.524547100067142,7
|
||||
50.450386085935094,30.524547100067142,9
|
||||
50.450386085935094,30.524547100067142,4
|
||||
50.450386085935094,30.524547100067142,0
|
||||
50.450386085935094,30.524547100067142,0
|
||||
50.450386085935094,30.524547100067142,3
|
||||
50.450386085935094,30.524547100067142,4
|
||||
50.450069433207545,30.52406822530458,16
|
||||
50.450069433207545,30.52406822530458,20
|
||||
50.450069433207545,30.52406822530458,25
|
||||
50.450069433207545,30.52406822530458,30
|
||||
50.450069433207545,30.52406822530458,29
|
||||
50.450069433207545,30.52406822530458,12
|
||||
50.450069433207545,30.52406822530458,10
|
||||
50.450069433207545,30.52406822530458,14
|
||||
50.450069433207545,30.52406822530458,3
|
||||
50.450069433207545,30.52406822530458,2
|
||||
|
@@ -1,13 +1,16 @@
|
||||
from dataclasses import dataclass
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from domain.accelerometer import Accelerometer
|
||||
from domain.gps import Gps
|
||||
from domain.parking import Parking
|
||||
|
||||
|
||||
@dataclass
|
||||
class AggregatedData:
|
||||
accelerometer: Accelerometer
|
||||
gps: Gps
|
||||
parking: Parking
|
||||
timestamp: datetime
|
||||
user_id: int
|
||||
|
||||
9
agent/src/domain/parking.py
Normal file
9
agent/src/domain/parking.py
Normal file
@@ -0,0 +1,9 @@
|
||||
from dataclasses import dataclass
|
||||
|
||||
from domain.gps import Gps
|
||||
|
||||
|
||||
@dataclass
|
||||
class Parking:
|
||||
empty_count: int
|
||||
gps: Gps
|
||||
@@ -1,5 +1,10 @@
|
||||
from csv import reader
|
||||
import csv
|
||||
import time
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import Optional, List
|
||||
|
||||
from domain.parking import Parking
|
||||
from domain.accelerometer import Accelerometer
|
||||
from domain.gps import Gps
|
||||
from domain.aggregated_data import AggregatedData
|
||||
@@ -7,24 +12,185 @@ import config
|
||||
|
||||
|
||||
class FileDatasource:
|
||||
def __init__(
|
||||
self,
|
||||
accelerometer_filename: str,
|
||||
gps_filename: str,
|
||||
) -> None:
|
||||
pass
|
||||
|
||||
def read(self) -> AggregatedData:
|
||||
"""Метод повертає дані отримані з датчиків"""
|
||||
return AggregatedData(
|
||||
Accelerometer(1, 2, 3),
|
||||
Gps(4, 5),
|
||||
datetime.now(),
|
||||
config.USER_ID,
|
||||
)
|
||||
def __init__(
|
||||
self,
|
||||
accelerometer_filename: str,
|
||||
gps_filename: str,
|
||||
park_filename: str,
|
||||
) -> None:
|
||||
|
||||
self.accelerometer_filename = accelerometer_filename
|
||||
self.park_filename = park_filename
|
||||
self.gps_filename = gps_filename
|
||||
|
||||
self._park_f = None
|
||||
self._acc_f = None
|
||||
self._gps_f = None
|
||||
|
||||
self._park_reader: Optional[csv.reader] = None
|
||||
self._acc_reader: Optional[csv.reader] = None
|
||||
self._gps_reader: Optional[csv.reader] = None
|
||||
|
||||
self._started = False
|
||||
|
||||
def startReading(self, *args, **kwargs):
|
||||
"""Метод повинен викликатись перед початком читання даних"""
|
||||
"""Must be called before read()"""
|
||||
if self._started:
|
||||
return
|
||||
|
||||
if not Path(self.accelerometer_filename).exists():
|
||||
raise FileNotFoundError(f"Accelerometer file not found: {self.accelerometer_filename}")
|
||||
if not Path(self.park_filename).exists():
|
||||
raise FileNotFoundError(f"Accelerometer file not found: {self.park_filename}")
|
||||
if not Path(self.gps_filename).exists():
|
||||
raise FileNotFoundError(f"GPS file not found: {self.gps_filename}")
|
||||
|
||||
self._open_files()
|
||||
self._started = True
|
||||
|
||||
def stopReading(self, *args, **kwargs):
|
||||
"""Метод повинен викликатись для закінчення читання даних"""
|
||||
"""Must be called when finishing reading"""
|
||||
self._close_files()
|
||||
self._started = False
|
||||
|
||||
def read(self) -> AggregatedData:
|
||||
"""Return one combined sample (acc + gps)."""
|
||||
if not self._started:
|
||||
raise RuntimeError("Datasource is not started. Call startReading() before read().")
|
||||
|
||||
acc_row = self._get_next_row(self._acc_reader, source="acc")
|
||||
park_row = self._get_next_row(self._park_reader, source="park")
|
||||
gps_row = self._get_next_row(self._gps_reader, source="gps")
|
||||
|
||||
acc = self._parse_acc(acc_row)
|
||||
park = self._parse_park(park_row)
|
||||
gps = self._parse_gps(gps_row)
|
||||
|
||||
# IMPORTANT: timing belongs to datasource (not MQTT / main.py)
|
||||
if config.DELAY and config.DELAY > 0:
|
||||
time.sleep(float(config.DELAY))
|
||||
|
||||
return AggregatedData(
|
||||
accelerometer=acc,
|
||||
gps=gps,
|
||||
parking=park,
|
||||
timestamp=datetime.utcnow(),
|
||||
user_id=config.USER_ID,
|
||||
)
|
||||
|
||||
# ---------------- internal ----------------
|
||||
|
||||
def _open_files(self) -> None:
|
||||
self._close_files()
|
||||
|
||||
self._acc_f = open(self.accelerometer_filename, "r", newline="", encoding="utf-8")
|
||||
self._park_f = open(self.park_filename, "r", newline="", encoding="utf-8")
|
||||
self._gps_f = open(self.gps_filename, "r", newline="", encoding="utf-8")
|
||||
|
||||
self._acc_reader = csv.reader(self._acc_f, skipinitialspace=True)
|
||||
self._park_reader = csv.reader(self._park_f, skipinitialspace=True)
|
||||
self._gps_reader = csv.reader(self._gps_f, skipinitialspace=True)
|
||||
|
||||
# File pointer is already at 0 right after open(), so no need to rewind here.
|
||||
# Skip header row once.
|
||||
next(self._acc_reader, None)
|
||||
next(self._park_reader, None)
|
||||
next(self._gps_reader, None)
|
||||
|
||||
def _close_files(self) -> None:
|
||||
for f in (self._acc_f, self._gps_f):
|
||||
try:
|
||||
if f is not None:
|
||||
f.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
self._acc_f = None
|
||||
self._park_f = None
|
||||
self._gps_f = None
|
||||
self._acc_reader = None
|
||||
self._park_reader = None
|
||||
self._gps_reader = None
|
||||
|
||||
def _rewind_acc(self) -> None:
|
||||
if self._acc_f is None:
|
||||
raise RuntimeError("Accelerometer file is not open.")
|
||||
self._acc_f.seek(0)
|
||||
self._acc_reader = csv.reader(self._acc_f, skipinitialspace=True)
|
||||
next(self._acc_reader, None) # skip header row
|
||||
|
||||
def _rewind_gps(self) -> None:
|
||||
if self._gps_f is None:
|
||||
raise RuntimeError("GPS file is not open.")
|
||||
self._gps_f.seek(0)
|
||||
self._gps_reader = csv.reader(self._gps_f, skipinitialspace=True)
|
||||
next(self._gps_reader, None) # skip header row
|
||||
|
||||
def _rewind_park(self) -> None:
|
||||
if self._park_f is None:
|
||||
raise RuntimeError("GPS file is not open.")
|
||||
self._park_f.seek(0)
|
||||
self._park_reader = csv.reader(self._park_f, skipinitialspace=True)
|
||||
next(self._park_reader, None) # skip header row
|
||||
|
||||
def _get_next_row(self, reader, source: str) -> List[str]:
|
||||
"""Get the next valid row from the reader."""
|
||||
if reader is None:
|
||||
raise RuntimeError("Reader is not initialized.")
|
||||
|
||||
while True:
|
||||
row = next(reader, None)
|
||||
if row is None:
|
||||
# EOF -> rewind & continue
|
||||
if source == "acc":
|
||||
self._rewind_acc()
|
||||
reader = self._acc_reader
|
||||
|
||||
elif source == 'park':
|
||||
self._rewind_park()
|
||||
reader = self._park_reader
|
||||
else:
|
||||
self._rewind_gps()
|
||||
reader = self._gps_reader
|
||||
continue
|
||||
|
||||
if not row or not any(cell.strip() for cell in row):
|
||||
continue
|
||||
|
||||
return row
|
||||
|
||||
@staticmethod
|
||||
def _parse_acc(row: List[str]) -> Accelerometer:
|
||||
if len(row) < 3:
|
||||
raise ValueError(f"Accelerometer row must have 3 values (x,y,z). Got: {row}")
|
||||
|
||||
try:
|
||||
x = int(row[0])
|
||||
y = int(row[1])
|
||||
z = int(row[2])
|
||||
except ValueError as e:
|
||||
raise ValueError(f"Invalid accelerometer values (expected integers): {row}") from e
|
||||
|
||||
return Accelerometer(x=x, y=y, z=z)
|
||||
|
||||
@staticmethod
|
||||
def _parse_gps(row: List[str]) -> Gps:
|
||||
if len(row) < 2:
|
||||
raise ValueError(f"GPS row must have 2 values (longitude,latitude). Got: {row}")
|
||||
lon = float(row[0])
|
||||
lat = float(row[1])
|
||||
return Gps(longitude=lon, latitude=lat)
|
||||
|
||||
@staticmethod
|
||||
def _parse_park(row: List[str]) -> Parking:
|
||||
if len(row) < 2:
|
||||
raise ValueError(f"GPS row must have 2 values (longitude,latitude). Got: {row}")
|
||||
lon = float(row[0])
|
||||
lat = float(row[1])
|
||||
empty_count = int(row[2])
|
||||
|
||||
return Parking(
|
||||
gps=Gps(longitude=lon, latitude=lat),
|
||||
empty_count=empty_count
|
||||
)
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
from paho.mqtt import client as mqtt_client
|
||||
import json
|
||||
import time
|
||||
from schema.aggregated_data_schema import AggregatedDataSchema
|
||||
from file_datasource import FileDatasource
|
||||
import config
|
||||
@@ -24,19 +22,14 @@ def connect_mqtt(broker, port):
|
||||
return client
|
||||
|
||||
|
||||
def publish(client, topic, datasource, delay):
|
||||
def publish(client, topic, datasource):
|
||||
datasource.startReading()
|
||||
while True:
|
||||
time.sleep(delay)
|
||||
data = datasource.read()
|
||||
msg = AggregatedDataSchema().dumps(data)
|
||||
result = client.publish(topic, msg)
|
||||
# result: [0, 1]
|
||||
status = result[0]
|
||||
if status == 0:
|
||||
pass
|
||||
# print(f"Send `{msg}` to topic `{topic}`")
|
||||
else:
|
||||
if status != 0:
|
||||
print(f"Failed to send message to topic {topic}")
|
||||
|
||||
|
||||
@@ -44,9 +37,9 @@ def run():
|
||||
# Prepare mqtt client
|
||||
client = connect_mqtt(config.MQTT_BROKER_HOST, config.MQTT_BROKER_PORT)
|
||||
# Prepare datasource
|
||||
datasource = FileDatasource("data/data.csv", "data/gps_data.csv")
|
||||
datasource = FileDatasource("data/accelerometer.csv", "data/gps.csv", "data/parking.csv")
|
||||
# Infinity publish data
|
||||
publish(client, config.MQTT_TOPIC, datasource, config.DELAY)
|
||||
publish(client, config.MQTT_TOPIC, datasource)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
from marshmallow import Schema, fields
|
||||
from schema.accelerometer_schema import AccelerometerSchema
|
||||
from schema.gps_schema import GpsSchema
|
||||
from schema.parking_schema import ParkingSchema
|
||||
|
||||
|
||||
class AggregatedDataSchema(Schema):
|
||||
accelerometer = fields.Nested(AccelerometerSchema)
|
||||
gps = fields.Nested(GpsSchema)
|
||||
parking = fields.Nested(ParkingSchema)
|
||||
timestamp = fields.DateTime("iso")
|
||||
user_id = fields.Int()
|
||||
|
||||
8
agent/src/schema/parking_schema.py
Normal file
8
agent/src/schema/parking_schema.py
Normal file
@@ -0,0 +1,8 @@
|
||||
from marshmallow import Schema, fields
|
||||
|
||||
from schema.gps_schema import GpsSchema
|
||||
|
||||
|
||||
class ParkingSchema(Schema):
|
||||
gps = fields.Nested(GpsSchema)
|
||||
empty_count = fields.Int()
|
||||
2
store/.gitignore
vendored
2
store/.gitignore
vendored
@@ -1,3 +1,5 @@
|
||||
venv
|
||||
__pycache__
|
||||
.idea
|
||||
|
||||
.idea/
|
||||
|
||||
0
store/__init__.py
Normal file
0
store/__init__.py
Normal file
15
store/database.py
Normal file
15
store/database.py
Normal file
@@ -0,0 +1,15 @@
|
||||
from sqlalchemy import MetaData
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker, declarative_base
|
||||
|
||||
from config import POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_HOST, POSTGRES_PORT, POSTGRES_DB
|
||||
|
||||
|
||||
DATABASE_URL = f"postgresql+psycopg2://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
|
||||
engine = create_engine(DATABASE_URL)
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
metadata = MetaData()
|
||||
|
||||
SessionLocal = sessionmaker(bind=engine)
|
||||
@@ -1,8 +1,7 @@
|
||||
version: "3.9"
|
||||
name: "road_vision__database"
|
||||
services:
|
||||
postgres_db:
|
||||
image: postgres:latest
|
||||
image: postgres:17
|
||||
container_name: postgres_db
|
||||
restart: always
|
||||
environment:
|
||||
|
||||
196
store/main.py
196
store/main.py
@@ -1,10 +1,8 @@
|
||||
import asyncio
|
||||
import json
|
||||
from typing import Set, Dict, List, Any
|
||||
from typing import Set, Dict, List
|
||||
from fastapi import FastAPI, HTTPException, WebSocket, WebSocketDisconnect, Body
|
||||
from fastapi.encoders import jsonable_encoder
|
||||
from sqlalchemy import (
|
||||
create_engine,
|
||||
MetaData,
|
||||
Table,
|
||||
Column,
|
||||
Integer,
|
||||
@@ -12,25 +10,14 @@ from sqlalchemy import (
|
||||
Float,
|
||||
DateTime,
|
||||
)
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.sql import select
|
||||
from datetime import datetime
|
||||
from pydantic import BaseModel, field_validator
|
||||
from config import (
|
||||
POSTGRES_HOST,
|
||||
POSTGRES_PORT,
|
||||
POSTGRES_DB,
|
||||
POSTGRES_USER,
|
||||
POSTGRES_PASSWORD,
|
||||
)
|
||||
|
||||
from database import metadata, SessionLocal
|
||||
from schemas import ProcessedAgentData, ProcessedAgentDataInDB
|
||||
|
||||
# FastAPI app setup
|
||||
app = FastAPI()
|
||||
# SQLAlchemy setup
|
||||
DATABASE_URL = f"postgresql+psycopg2://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
|
||||
engine = create_engine(DATABASE_URL)
|
||||
metadata = MetaData()
|
||||
# Define the ProcessedAgentData table
|
||||
|
||||
processed_agent_data = Table(
|
||||
"processed_agent_data",
|
||||
metadata,
|
||||
@@ -44,57 +31,6 @@ processed_agent_data = Table(
|
||||
Column("longitude", Float),
|
||||
Column("timestamp", DateTime),
|
||||
)
|
||||
SessionLocal = sessionmaker(bind=engine)
|
||||
|
||||
|
||||
# SQLAlchemy model
|
||||
class ProcessedAgentDataInDB(BaseModel):
|
||||
id: int
|
||||
road_state: str
|
||||
user_id: int
|
||||
x: float
|
||||
y: float
|
||||
z: float
|
||||
latitude: float
|
||||
longitude: float
|
||||
timestamp: datetime
|
||||
|
||||
|
||||
# FastAPI models
|
||||
class AccelerometerData(BaseModel):
|
||||
x: float
|
||||
y: float
|
||||
z: float
|
||||
|
||||
|
||||
class GpsData(BaseModel):
|
||||
latitude: float
|
||||
longitude: float
|
||||
|
||||
|
||||
class AgentData(BaseModel):
|
||||
user_id: int
|
||||
accelerometer: AccelerometerData
|
||||
gps: GpsData
|
||||
timestamp: datetime
|
||||
|
||||
@classmethod
|
||||
@field_validator("timestamp", mode="before")
|
||||
def check_timestamp(cls, value):
|
||||
if isinstance(value, datetime):
|
||||
return value
|
||||
try:
|
||||
return datetime.fromisoformat(value)
|
||||
except (TypeError, ValueError):
|
||||
raise ValueError(
|
||||
"Invalid timestamp format. Expected ISO 8601 format (YYYY-MM-DDTHH:MM:SSZ)."
|
||||
)
|
||||
|
||||
|
||||
class ProcessedAgentData(BaseModel):
|
||||
road_state: str
|
||||
agent_data: AgentData
|
||||
|
||||
|
||||
# WebSocket subscriptions
|
||||
subscriptions: Dict[int, Set[WebSocket]] = {}
|
||||
@@ -125,10 +61,36 @@ async def send_data_to_subscribers(user_id: int, data):
|
||||
|
||||
|
||||
@app.post("/processed_agent_data/")
|
||||
async def create_processed_agent_data(data: List[ProcessedAgentData]):
|
||||
# Insert data to database
|
||||
# Send data to subscribers
|
||||
pass
|
||||
async def create_processed_agent_data(data: List[ProcessedAgentData], user_id: int = Body(..., embed=True)):
|
||||
session = SessionLocal()
|
||||
try:
|
||||
created_data = [
|
||||
{
|
||||
"road_state": item.road_state,
|
||||
"user_id": user_id,
|
||||
"x": item.agent_data.accelerometer.x,
|
||||
"y": item.agent_data.accelerometer.y,
|
||||
"z": item.agent_data.accelerometer.z,
|
||||
"latitude": item.agent_data.gps.latitude,
|
||||
"longitude": item.agent_data.gps.longitude,
|
||||
"timestamp": item.agent_data.timestamp,
|
||||
}
|
||||
for item in data
|
||||
]
|
||||
stmt = processed_agent_data.insert().values(created_data).returning(processed_agent_data)
|
||||
result = session.execute(stmt)
|
||||
created_records = [dict(row._mapping) for row in result.fetchall()]
|
||||
session.commit()
|
||||
|
||||
for record in created_records:
|
||||
await send_data_to_subscribers(user_id, jsonable_encoder(record))
|
||||
return created_records
|
||||
except Exception as err:
|
||||
session.rollback()
|
||||
print(f"Database error: {err}")
|
||||
raise HTTPException(status_code=500, detail="Internal Server Error")
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
@app.get(
|
||||
@@ -136,14 +98,34 @@ async def create_processed_agent_data(data: List[ProcessedAgentData]):
|
||||
response_model=ProcessedAgentDataInDB,
|
||||
)
|
||||
def read_processed_agent_data(processed_agent_data_id: int):
|
||||
# Get data by id
|
||||
pass
|
||||
session = SessionLocal()
|
||||
try:
|
||||
stmt = select(processed_agent_data).where(
|
||||
processed_agent_data.c.id == processed_agent_data_id
|
||||
)
|
||||
res = session.execute(stmt).fetchone()
|
||||
if not res:
|
||||
raise HTTPException(status_code=404, detail="Not found")
|
||||
|
||||
return dict(res._mapping)
|
||||
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
@app.get("/processed_agent_data/", response_model=list[ProcessedAgentDataInDB])
|
||||
def list_processed_agent_data():
|
||||
# Get list of data
|
||||
pass
|
||||
session = SessionLocal()
|
||||
try:
|
||||
stmt = select(processed_agent_data)
|
||||
res = session.execute(stmt).fetchall()
|
||||
if not res:
|
||||
raise HTTPException(status_code=404, detail="Not found")
|
||||
|
||||
return [dict(r._mapping) for r in res]
|
||||
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
@app.put(
|
||||
@@ -152,7 +134,41 @@ def list_processed_agent_data():
|
||||
)
|
||||
def update_processed_agent_data(processed_agent_data_id: int, data: ProcessedAgentData):
|
||||
# Update data
|
||||
pass
|
||||
session = SessionLocal()
|
||||
|
||||
try:
|
||||
query = select(processed_agent_data).where(
|
||||
processed_agent_data.c.id == processed_agent_data_id
|
||||
)
|
||||
result = session.execute(query).fetchone()
|
||||
|
||||
if not result:
|
||||
raise HTTPException(status_code=404, detail="Data not found")
|
||||
|
||||
update_query = (
|
||||
processed_agent_data.update()
|
||||
.where(processed_agent_data.c.id == processed_agent_data_id)
|
||||
.values(
|
||||
road_state=data.road_state,
|
||||
user_id=data.agent_data.user_id,
|
||||
x=data.agent_data.accelerometer.x,
|
||||
y=data.agent_data.accelerometer.y,
|
||||
z=data.agent_data.accelerometer.z,
|
||||
latitude=data.agent_data.gps.latitude,
|
||||
longitude=data.agent_data.gps.longitude,
|
||||
timestamp=data.agent_data.timestamp,
|
||||
)
|
||||
)
|
||||
|
||||
session.execute(update_query)
|
||||
session.commit()
|
||||
|
||||
updated_result = session.execute(query).fetchone()
|
||||
|
||||
return ProcessedAgentDataInDB(**updated_result._mapping)
|
||||
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
@app.delete(
|
||||
@@ -161,8 +177,28 @@ def update_processed_agent_data(processed_agent_data_id: int, data: ProcessedAge
|
||||
)
|
||||
def delete_processed_agent_data(processed_agent_data_id: int):
|
||||
# Delete by id
|
||||
pass
|
||||
session = SessionLocal()
|
||||
|
||||
try:
|
||||
query = select(processed_agent_data).where(
|
||||
processed_agent_data.c.id == processed_agent_data_id
|
||||
)
|
||||
result = session.execute(query).fetchone()
|
||||
|
||||
if not result:
|
||||
raise HTTPException(status_code=404, detail="Data not found")
|
||||
|
||||
delete_query = processed_agent_data.delete().where(
|
||||
processed_agent_data.c.id == processed_agent_data_id
|
||||
)
|
||||
|
||||
session.execute(delete_query)
|
||||
session.commit()
|
||||
|
||||
return ProcessedAgentDataInDB(**result._mapping)
|
||||
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
if __name__ == "__main__":
|
||||
import uvicorn
|
||||
|
||||
Binary file not shown.
51
store/schemas.py
Normal file
51
store/schemas.py
Normal file
@@ -0,0 +1,51 @@
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, field_validator
|
||||
|
||||
|
||||
class ProcessedAgentDataInDB(BaseModel):
|
||||
id: int
|
||||
road_state: str
|
||||
user_id: int
|
||||
x: float
|
||||
y: float
|
||||
z: float
|
||||
latitude: float
|
||||
longitude: float
|
||||
timestamp: datetime
|
||||
|
||||
|
||||
# FastAPI models
|
||||
class AccelerometerData(BaseModel):
|
||||
x: float
|
||||
y: float
|
||||
z: float
|
||||
|
||||
|
||||
class GpsData(BaseModel):
|
||||
latitude: float
|
||||
longitude: float
|
||||
|
||||
|
||||
class AgentData(BaseModel):
|
||||
user_id: int
|
||||
accelerometer: AccelerometerData
|
||||
gps: GpsData
|
||||
timestamp: datetime
|
||||
|
||||
@classmethod
|
||||
@field_validator("timestamp", mode="before")
|
||||
def check_timestamp(cls, value):
|
||||
if isinstance(value, datetime):
|
||||
return value
|
||||
try:
|
||||
return datetime.fromisoformat(value)
|
||||
except (TypeError, ValueError):
|
||||
raise ValueError(
|
||||
"Invalid timestamp format. Expected ISO 8601 format (YYYY-MM-DDTHH:MM:SSZ)."
|
||||
)
|
||||
|
||||
|
||||
class ProcessedAgentData(BaseModel):
|
||||
road_state: str
|
||||
agent_data: AgentData
|
||||
Reference in New Issue
Block a user