diff --git a/compile_proto.sh b/compile_proto.sh index fdaf164..8884ef1 100755 --- a/compile_proto.sh +++ b/compile_proto.sh @@ -3,18 +3,12 @@ # Terminate on errors set -e - printf "Synchronising submodules... " -git submodule sync --recursive >> /dev/null -git submodule update --recursive --remote --init >> /dev/null +git submodule sync --recursive >>/dev/null +git submodule update --recursive --remote --init >>/dev/null printf "DONE\n\n" server_file="./protos/fishjam/server_notifications.proto" printf "Compiling: file $server_file\n" protoc -I . --python_betterproto_out=./fishjam/events/_protos $server_file printf "\tDONE\n" - -peer_file="./protos/fishjam/peer_notifications.proto" -printf "Compiling: file $peer_file\n" -protoc -I . --python_betterproto_out=./tests/support/protos $peer_file -printf "\tDONE\n" diff --git a/fishjam/events/_protos/fishjam/__init__.py b/fishjam/events/_protos/fishjam/__init__.py index cf42826..3fdcb5e 100644 --- a/fishjam/events/_protos/fishjam/__init__.py +++ b/fishjam/events/_protos/fishjam/__init__.py @@ -9,7 +9,7 @@ class ServerMessageEventType(betterproto.Enum): - """Defines message groups for which client can subscribe""" + """Defines message groups for which peer can subscribe""" EVENT_TYPE_UNSPECIFIED = 0 EVENT_TYPE_SERVER_NOTIFICATION = 1 @@ -26,7 +26,7 @@ class ServerMessageTrackType(betterproto.Enum): @dataclass(eq=False, repr=False) class ServerMessage(betterproto.Message): - """Defines any type of message passed between FJ and server client""" + """Defines any type of message passed between FJ and server peer""" room_crashed: "ServerMessageRoomCrashed" = betterproto.message_field( 1, group="content" @@ -158,14 +158,14 @@ class ServerMessageAuthenticated(betterproto.Message): @dataclass(eq=False, repr=False) class ServerMessageAuthRequest(betterproto.Message): - """Request sent by client, to authenticate to FJ server""" + """Request sent by peer, to authenticate to FJ server""" token: str = betterproto.string_field(1) @dataclass(eq=False, repr=False) class ServerMessageSubscribeRequest(betterproto.Message): - """Request sent by client to subsribe for certain message type""" + """Request sent by peer to subsribe for certain message type""" event_type: "ServerMessageEventType" = betterproto.enum_field(1) diff --git a/protos b/protos index 8c149b2..0bcb420 160000 --- a/protos +++ b/protos @@ -1 +1 @@ -Subproject commit 8c149b2dd68257edadc0a1e8048fb15c67b22125 +Subproject commit 0bcb420955d0441a355c49be0a492d9b827fbbe8 diff --git a/pyproject.toml b/pyproject.toml index e70f9f9..872cb2a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "fishjam-server-sdk" -version = "0.7.0" +version = "0.8.0" description = "Python server SDK for the Fishjam Cloud" authors = ["Fishjam Team"] homepage = "https://github.com/fishjam-cloud/python-server-sdk" @@ -62,11 +62,19 @@ ignore = [] [tool.pytest.ini_options] markers = [ - "file_component_sources: Tests requiring files uploaded for File Component" + "file_component_sources: Tests requiring files uploaded for File Component", ] [tool.pyright] -exclude = ["**/.venv", "**/__pycache__", ".pytest_cache", ".ruff_cache", "lib", "fishjam/_openapi_client", "tests"] +exclude = [ + "**/.venv", + "**/__pycache__", + ".pytest_cache", + ".ruff_cache", + "lib", + "fishjam/_openapi_client", + "tests", +] typeCheckingMode = "basic" venv = ".venv" venvPath = "."