Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GUI File Server and Alternate GUI Framework Support #9

Merged
merged 29 commits into from
Jul 8, 2023
Merged

GUI File Server and Alternate GUI Framework Support #9

merged 29 commits into from
Jul 8, 2023

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented May 1, 2023 •
edited by NeonDaniel
Loading

Adds support for multiple GUIs, including multiple concurrent clients using different GUI frameworks

setting to translate qml paths to urls

replaces OpenVoiceOS/ovos-core#38

adds support for ovos-docker

2023-05-02 02:13:22.088 - gui - ovos_gui.bus:create_gui_service:65 - INFO - GUI Message bus started!
2023-05-02 02:13:22.088 - gui - ovos_gui.namespace:_get_idle_display_config:384 - INFO - Getting Idle Skill From Config
2023-05-02 02:13:22.088 - gui - ovos_gui.namespace:_get_active_gui_extension:394 - INFO - Getting GUI Extension From Config
2023-05-02 02:13:22.090 - gui - ovos_gui.qml_server:_initialize_http_server:49 - INFO - QML file server started: 0.0.0.0:8089
2023-05-02 02:13:22.091 - gui - ovos_gui.service:on_alive:14 - INFO - Gui Service is alive.
(...)
2023-05-02 02:13:25.706 - gui - ovos_gui.namespace:handle_client_connected:751 - INFO - GUI with ID ovos-gui-client_922259 connected to core message bus
2023-05-02 02:14:38.925 - gui - ovos_gui.namespace:handle_show_page:521 - INFO - Handling page show request
2023-05-02 02:14:38.926 - gui - ovos_gui.page:__init__:35 - INFO - serving qml file SYSTEM_ImageFrame.qml from /tmp/ovos_qml_server/SYSTEM_ImageFrame.qml via http://0.0.0.0:8089/SYSTEM_ImageFrame.qml
2023-05-02 02:14:38.926 - gui - ovos_gui.namespace:_activate_namespace:560 - INFO - Activating namespace: skill-ovos-wikipedia.openvoiceos
(...)
2023-05-02 02:14:38.928 - gui - ovos_gui.namespace:_add_pages:238 - INFO - Page: http://0.0.0.0:8089/SYSTEM_ImageFrame.qml, SYSTEM_ImageFrame.qml, False, 20
2023-05-02 02:14:38.929 - gui - ovos_gui.namespace:_activate_page:258 - INFO - Activating page SYSTEM_ImageFrame.qml in GUI namespace skill-ovos-wikipedia.openvoiceos

@JarbasAl JarbasAl added the enhancement New feature or request label May 1, 2023
@JarbasAl JarbasAl requested review from goldyfruit, NeonDaniel and a team May 1, 2023 23:38
@JarbasAl JarbasAl mentioned this pull request May 1, 2023
Closed
@codecov
Copy link

codecov bot commented May 2, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (dev@f446173). Click here to learn what that means.
The diff coverage is n/a.

@@          Coverage Diff           @@
##             dev       #9   +/-   ##
======================================
  Coverage       ?   53.02%           
======================================
  Files          ?       11           
  Lines          ?      992           
  Branches       ?        0           
======================================
  Hits           ?      526           
  Misses         ?      466           
  Partials       ?        0

goldyfruit
goldyfruit reviewed May 2, 2023
View reviewed changes
Copy link
Member

@goldyfruit goldyfruit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

README should be updated as well for the qml_server option.

@JarbasAl JarbasAl mentioned this pull request May 2, 2023
Merged
JarbasAl
JarbasAl commented May 2, 2023
View reviewed changes
ovos_gui/page.py Outdated Show resolved Hide resolved
@JarbasAl JarbasAl marked this pull request as draft June 21, 2023 18:53
@JarbasAl
feat/qml_server
c0a5b08 
comments

enclosure everywhere, clarity nowhere

Update GUI page handling to always write gathered pages locally
Support configured GUI directory to write files to (i.e. for a mounted docker volume)

Start on URI determination with annotated TODO

Add handler to request GUI pages on `ready`

not bytes

bus upload qml

bus upload qml

better logs

better logs

feat/qml_server

setting to translate qml paths to urls

Increment Version
NeonDaniel
NeonDaniel requested changes Jun 29, 2023
View reviewed changes
ovos_gui/bus.py Outdated Show resolved Hide resolved
ovos_gui/bus.py Outdated Show resolved Hide resolved
ovos_gui/bus.py Show resolved Hide resolved
ovos_gui/bus.py Outdated Show resolved Hide resolved
ovos_gui/namespace.py Outdated Show resolved Hide resolved
ovos_gui/qml_server.py Outdated Show resolved Hide resolved
JarbasAl
JarbasAl commented Jul 4, 2023
View reviewed changes
ovos_gui/bus.py Outdated Show resolved Hide resolved
@NeonDaniel
Make _framework an instance variable instead of class
bd8e66e
@NeonDaniel
Add type annotations and resolve reference errors from refactor
9c0207e
@NeonDaniel
Refactor name to skill_id in unit test
f03cf60
@NeonDaniel
Fix typo in WebSocketHandler init
9549c45
@NeonDaniel
Fix handling of uploaded GUI pages
64101c5 
Update GUI page upload to handle encoded bytes for non-text file support
@NeonDaniel
Fix typo in GUI file decode
70d339f
@NeonDaniel
Fix uploaded binary file handling
5c08676 
Remove internal reference to uploaded files
@NeonDaniel
Update resource path handling
40a3b44
@NeonDaniel
Fix resource output path
593a04f
@NeonDaniel
Refactor NamespaceManager to use page.id instead of page.url to a…
15c7e16 
…ccount for different clients

Update GuiPage and references to account for resolving resources per-client
@NeonDaniel
Fix syntax error in type annotation
a5bff81
@NeonDaniel
Troubleshoot served GUI file resolution
0d567d4
@NeonDaniel
Troubleshoot served GUI file resolution
a5e8680
@NeonDaniel
Fix typo in file extension handling
5cbea01
@NeonDaniel
Minor adjustments to GuiWebsocketHandler with added unit tests
ecda815
@NeonDaniel
Refactor changes
1cca7c6 
Include homescreen reload after resource file upload
Add unit test coverage
@NeonDaniel
Fix missed references from refactor
faa8f8e
@NeonDaniel
Cleanup logging
2cf3c1e
@JarbasAl JarbasAl mentioned this pull request Jul 6, 2023
Open
@NeonDaniel NeonDaniel marked this pull request as ready for review July 6, 2023 22:21
@NeonDaniel NeonDaniel changed the title feat/qml_server GUI File Server and Alternate GUI Framework Support Jul 6, 2023
@NeonDaniel NeonDaniel marked this pull request as draft July 6, 2023 22:51
@NeonDaniel NeonDaniel marked this pull request as ready for review July 7, 2023 00:36
@JarbasAl JarbasAl mentioned this pull request Jul 7, 2023
Closed
@NeonDaniel
Copy link
Member

NeonDaniel commented Jul 7, 2023 •
edited
Loading

Replaces #18
Needs OpenVoiceOS/ovos-utils#178

@JarbasAl JarbasAl merged commit fc49193 into dev Jul 8, 2023
7 checks passed
@JarbasAl JarbasAl deleted the feat/qml_server branch July 8, 2023 00:05
@github-actions github-actions bot mentioned this pull request Jul 20, 2023
Merged
@JarbasAl JarbasAl mentioned this pull request Aug 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeonDaniel NeonDaniel NeonDaniel approved these changes

@goldyfruit goldyfruit Awaiting requested review from goldyfruit

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JarbasAl @NeonDaniel @goldyfruit