Skip to content

Commit

Permalink
Merge branch 'dev' into protocol_permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
JarbasAl authored Jul 5, 2024
2 parents ba8b0d5 + 7b483b5 commit aa8507c
Show file tree
Hide file tree
Showing 19 changed files with 997 additions and 346 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish_alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- 'LICENSE'
- 'CHANGELOG.md'
- 'MANIFEST.in'
- 'readme.md'
- 'README.md'
- 'scripts/**'
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
#.idea/
118 changes: 113 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,113 @@
# Changelog

## [Unreleased](https://github.com/JarbasHiveMind/HiveMind-core/tree/HEAD)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a18...HEAD)

**Implemented enhancements:**

- feat/skill\_intent\_blacklist\_per\_client [\#89](https://github.com/JarbasHiveMind/HiveMind-core/pull/89) ([JarbasAl](https://github.com/JarbasAl))

## [V0.13.1a18](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a18) (2024-07-01)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a17...V0.13.1a18)

**Fixed bugs:**

- fix/session\_mapping [\#94](https://github.com/JarbasHiveMind/HiveMind-core/pull/94) ([JarbasAl](https://github.com/JarbasAl))

## [V0.13.1a17](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a17) (2024-07-01)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a16...V0.13.1a17)

**Fixed bugs:**

- fix/91 [\#92](https://github.com/JarbasHiveMind/HiveMind-core/pull/92) ([JarbasAl](https://github.com/JarbasAl))

**Closed issues:**

- KeyError: 'VoiceSatelliteV0.3.0:10.233.100.128::default' [\#91](https://github.com/JarbasHiveMind/HiveMind-core/issues/91)

## [V0.13.1a16](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a16) (2024-06-05)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a15...V0.13.1a16)

**Implemented enhancements:**

- feat/intercom [\#86](https://github.com/JarbasHiveMind/HiveMind-core/pull/86) ([JarbasAl](https://github.com/JarbasAl))

## [V0.13.1a15](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a15) (2024-06-05)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a14...V0.13.1a15)

**Implemented enhancements:**

- allow to report SEI to OCP [\#87](https://github.com/JarbasHiveMind/HiveMind-core/pull/87) ([JarbasAl](https://github.com/JarbasAl))

## [V0.13.1a14](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a14) (2024-05-02)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a13...V0.13.1a14)

**Implemented enhancements:**

- fix/allow\_audio\_state\_messages\_for\_session [\#85](https://github.com/JarbasHiveMind/HiveMind-core/pull/85) ([JarbasAl](https://github.com/JarbasAl))

## [V0.13.1a13](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a13) (2024-04-22)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a12...V0.13.1a13)

## [V0.13.1a12](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a12) (2024-04-22)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a11...V0.13.1a12)

## [V0.13.1a11](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a11) (2024-04-21)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a10...V0.13.1a11)

**Fixed bugs:**

- fix/clients\_manage\_their\_own\_sessions [\#84](https://github.com/JarbasHiveMind/HiveMind-core/pull/84) ([JarbasAl](https://github.com/JarbasAl))

**Closed issues:**

- Proposal/s: compressing messages, URIs for nodes, and how they relate [\#14](https://github.com/JarbasHiveMind/HiveMind-core/issues/14)

## [V0.13.1a10](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a10) (2024-01-02)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a9...V0.13.1a10)

**Merged pull requests:**

- Fix missing host argument [\#80](https://github.com/JarbasHiveMind/HiveMind-core/pull/80) ([goldyfruit](https://github.com/goldyfruit))

## [V0.13.1a9](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a9) (2024-01-02)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a8...V0.13.1a9)

**Closed issues:**

- Handle client deletion by name [\#68](https://github.com/JarbasHiveMind/HiveMind-core/issues/68)

**Merged pull requests:**

- Add support to remote bus address and port [\#79](https://github.com/JarbasHiveMind/HiveMind-core/pull/79) ([goldyfruit](https://github.com/goldyfruit))

## [V0.13.1a8](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a8) (2023-11-24)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a7...V0.13.1a8)

## [V0.13.1a7](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a7) (2023-11-21)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a6...V0.13.1a7)

## [V0.13.1a6](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a6) (2023-10-17)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a5...V0.13.1a6)

## [V0.13.1a5](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a5) (2023-10-17)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a4...V0.13.1a5)

## [V0.13.1a4](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.1a4) (2023-10-13)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.1a3...V0.13.1a4)
Expand Down Expand Up @@ -54,15 +162,15 @@

## [V0.13.0a4](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.0a4) (2023-08-03)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.0a2...V0.13.0a4)
[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.0a3...V0.13.0a4)

## [V0.13.0a2](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.0a2) (2023-08-03)
## [V0.13.0a3](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.0a3) (2023-08-03)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.0a3...V0.13.0a2)
[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.13.0a2...V0.13.0a3)

## [V0.13.0a3](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.0a3) (2023-08-03)
## [V0.13.0a2](https://github.com/JarbasHiveMind/HiveMind-core/tree/V0.13.0a2) (2023-08-03)

[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.11.0a3...V0.13.0a3)
[Full Changelog](https://github.com/JarbasHiveMind/HiveMind-core/compare/V0.11.0a3...V0.13.0a2)

**Breaking changes:**

Expand Down
39 changes: 23 additions & 16 deletions examples/fakecroft.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
from ovos_utils.log import LOG
from ovos_utils.messagebus import FakeBus
from hivemind_listener.service import MessageBusEventHandler
from hivemind_listener.protocol import HiveMindListenerProtocol, \
HiveMindListenerInternalProtocol, HiveMindClientConnection
from hivemind_listener.protocol import (
HiveMindListenerProtocol,
HiveMindListenerInternalProtocol,
HiveMindClientConnection,
)


class HiveMindFakeCroftProtocol(HiveMindListenerProtocol):
""" Fake ovos-core instance, not actually connected to a messagebus"""
"""Fake ovos-core instance, not actually connected to a messagebus"""

peer: str = "fakecroft:0.0.0.0"

def bind(self, websocket, bus=None):
Expand All @@ -17,46 +21,49 @@ def bind(self, websocket, bus=None):
bus = FakeBus()
self.internal_protocol = HiveMindListenerInternalProtocol(bus)

def handle_incoming_mycroft(self, message: Message, client: HiveMindClientConnection):
def handle_incoming_mycroft(
self, message: Message, client: HiveMindClientConnection
):
"""
message (Message): mycroft bus message object
"""
super().handle_inject_mycroft_msg(message, client)
answer = "mycroft is dead! long live mycroft!"

payload = HiveMessage(HiveMessageType.BUS,
message.reply("speak", {"utterance": answer}))
payload = HiveMessage(
HiveMessageType.BUS, message.reply("speak", {"utterance": answer})
)
client.send(payload)


def on_ready():
LOG.info('FakeCroft started!')
LOG.info("FakeCroft started!")


def on_error(e='Unknown'):
LOG.info('FakeCroft failed to start ({})'.format(repr(e)))
def on_error(e="Unknown"):
LOG.info("FakeCroft failed to start ({})".format(repr(e)))


def on_stopping():
LOG.info('FakeCroft is shutting down...')
LOG.info("FakeCroft is shutting down...")


def main(ready_hook=on_ready, error_hook=on_error, stopping_hook=on_stopping):
from ovos_utils import create_daemon, wait_for_exit_signal
from tornado import web, ioloop
from ovos_config import Configuration

LOG.info('Starting FakeCroft...')
LOG.info("Starting FakeCroft...")

try:
websocket_configs = Configuration()['websocket']
websocket_configs = Configuration()["websocket"]
except KeyError as ke:
LOG.error('No websocket configs found ({})'.format(repr(ke)))
LOG.error("No websocket configs found ({})".format(repr(ke)))
raise

host = websocket_configs.get('host')
port = websocket_configs.get('port')
route = websocket_configs.get('route')
host = websocket_configs.get("host")
port = websocket_configs.get("port")
route = websocket_configs.get("route")
port = 5678
route = "/"

Expand Down
Loading

0 comments on commit aa8507c

Please sign in to comment.