Skip to content
Snippets Groups Projects
Commit d6f691bb authored by Duc Bui Tien's avatar Duc Bui Tien
Browse files

added saving of the new config xml file

parent d37c92b3
No related branches found
No related tags found
2 merge requests!2UnicadoGuiBackend,!1New UnicadoGUI Branch
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 42
− 33
View file @ d6f691bb
......@@ -4,11 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ade4f2dd-968a-4099-9236-831254f6eb55" name="Changes" comment="add modules conf save and load">
<list default="true" id="ade4f2dd-968a-4099-9236-831254f6eb55" name="Changes" comment="modify so it now uses the xmltodict package">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/xmlConfigReader.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/xmltodict.py" beforeDir="false" afterPath="$PROJECT_DIR$/xmltodict_custom.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -42,31 +40,31 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"FastAPI.fastApiUnicado.executor": "Run",
"HTTP Request.test_main | #1.executor": "Run",
"HTTP Request.test_main | #2.executor": "Run",
"HTTP Request.test_main | #3.executor": "Run",
"HTTP Request.test_main | #4.executor": "Run",
"HTTP Request.test_main | #5.executor": "Run",
"HTTP Request.test_main | #6.executor": "Run",
"HTTP Request.test_main | #8.executor": "Run",
"Python.test.executor": "Run",
"Python.xmlConfigReader.executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"codeWithMe.voiceChat.enabledByDefault": "false",
"last_opened_file_path": "C:/Users/d_bui/PycharmProjects/fastApiUnicado/xml_configs",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;FastAPI.fastApiUnicado.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #1.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #2.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #3.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #4.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #5.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #6.executor&quot;: &quot;Run&quot;,
&quot;HTTP Request.test_main | #8.executor&quot;: &quot;Run&quot;,
&quot;Python.test.executor&quot;: &quot;Run&quot;,
&quot;Python.xmlConfigReader.executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/d_bui/PycharmProjects/fastApiUnicado/xml_configs&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\d_bui\PycharmProjects\fastApiUnicado\xml_configs" />
......@@ -161,8 +159,8 @@
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.18034.82" />
<option value="bundled-python-sdk-975db3bf15a3-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.18034.82" />
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.19072.16" />
<option value="bundled-python-sdk-8336bb23522e-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.19072.16" />
</set>
</attachedChunks>
</component>
......@@ -248,7 +246,9 @@
<workItem from="1722412633194" duration="1785000" />
<workItem from="1722498748024" duration="3028000" />
<workItem from="1722927552270" duration="5580000" />
<workItem from="1723097897034" duration="13697000" />
<workItem from="1723097897034" duration="14035000" />
<workItem from="1723191023145" duration="2551000" />
<workItem from="1723204841494" duration="634000" />
</task>
<task id="LOCAL-00001" summary="add update_Modules">
<option name="closed" value="true" />
......@@ -290,7 +290,15 @@
<option name="project" value="LOCAL" />
<updated>1721978291649</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="modify so it now uses the xmltodict package">
<option name="closed" value="true" />
<created>1723121369214</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1723121369214</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -325,11 +333,12 @@
<MESSAGE value="add get_modulePath" />
<MESSAGE value="refactor convergence endpoints &#10;update modules endpoints" />
<MESSAGE value="add modules conf save and load" />
<option name="LAST_COMMIT_MESSAGE" value="add modules conf save and load" />
<MESSAGE value="modify so it now uses the xmltodict package" />
<option name="LAST_COMMIT_MESSAGE" value="modify so it now uses the xmltodict package" />
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/fastApiUnicado$test.coverage" NAME="test Coverage Results" MODIFIED="1711008069985" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/fastApiUnicado$xmlConfigReader.coverage" NAME="xmlConfigReader Coverage Results" MODIFIED="1720078308255" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/fastApiUnicado$fastApiUnicado.coverage" NAME="fastApiUnicado Coverage Results" MODIFIED="1723120874519" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/fastApiUnicado$fastApiUnicado.coverage" NAME="fastApiUnicado Coverage Results" MODIFIED="1723204435135" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
</component>
</project>
\ No newline at end of file
main.py
+ 10
− 6
View file @ d6f691bb
......@@ -36,9 +36,10 @@ class Modules(BaseModel):
groups: list = []
class Conf(BaseModel):
name: str
control_settings: dict = {}
program_settings: dict = {}
module_configuration_file: dict = {}
# name: str
# control_settings: dict = {}
# program_settings: dict = {}
def search_modules(dict, name, root):
list = []
for i in range(len(root.findall(f"ProgramSettings/{name}/Program/Name"))):
......@@ -117,12 +118,15 @@ async def get_module_config(module: str):
#config = json.dumps(xmltodict.XmlDictConfig(root))
with open("xml_configs/"+module+"_conf.xml", encoding='utf8') as fd:
config = json.dumps(xmltodict.parse(fd.read()))
print(config)
return config
@app.put("/modules/config/update")
async def update_module_config(config: Conf):
print(config)
return config
dict = {"module_configuration_file": config.module_configuration_file}
xml = xmltodict.unparse(dict, pretty=True)
print(xml)
with open("xml_configs/" + config.module_configuration_file["@name"], "w") as fd:
fd.write(xml)
return
@app.get("/graph/")
async def get_plotData():
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment