lovekit 4.0.0__tar.gz → 4.2.0__tar.gz

{lovekit-4.0.0 → lovekit-4.2.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: lovekit
-Version: 4.0.0
+Version: 4.2.0
 Author-email: jhnnsrs <jhnnsrs@gmail.com>
 Requires-Python: >=3.11
 Requires-Dist: aiohttp<4,>=3.9.5
-Requires-Dist: arkitekt-spec>=3.4
-Requires-Dist: fakts>=5.4
+Requires-Dist: arkitekt-spec>=3.19.1
+Requires-Dist: fakts>=6.1
 Requires-Dist: livekit>=1.0
 Requires-Dist: numpy>=1.26
 Requires-Dist: rath>=4.1.1

{lovekit-4.0.0 → lovekit-4.2.0}/lovekit/api/project.json

@@ -66,6 +66,13 @@
             "external_modules": [],
             "additional_bases": {},
             "additional_config": {},
+            "directive_class_vars": [
+                {
+                    "directive": "identified",
+                    "argument": "by",
+                    "attribute": "__identifier__"
+                }
+            ],
             "force_plugin_order": true,
             "omitted_document_rules": [],
             "parsers": [],

{lovekit-4.0.0 → lovekit-4.2.0}/lovekit/api/schema.graphql

@@ -1,3 +1,7 @@
+directive @auth(required_scopes: [String!], required_roles: [String!], required_org_roles: [String!], any_scope_of: [String!], any_role_of: [String!], any_org_role_of: [String!], allow_scoped: Boolean) on FIELD_DEFINITION
+
+directive @identified(by: String!) on OBJECT
+
 directive @oneOf on INPUT_OBJECT
 
 schema @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"]) {
@@ -15,7 +19,7 @@ input AddToCallInput {
 """
 An app instance that owns live streams: one per client, user and organization
 """
-type Agent {
+type Agent @identified(by: "@lovekit/agent") {
   id: ID!
   client: Client!
   user: User!
@@ -144,6 +148,55 @@ type Client @key(fields: "id", resolvable: true) {
   clientId: String!
 }
 
+"""
+What a guest granted it sees of the organization: the objects put in it, and what is part of them.
+"""
+type Collaboration {
+  id: ID!
+  name: String!
+  description: String
+  createdAt: DateTime!
+
+  """What is in the collaboration; what is part of these is in it too"""
+  items: [CollaborationItem!]!
+}
+
+"""
+One object in a collaboration: put there, or brought along with one that needs it to be seen.
+"""
+type CollaborationItem {
+  id: ID!
+
+  """The object's id, in its structure"""
+  objectId: String!
+  addedAt: DateTime!
+
+  """The structure the object is known by across the hub: @mikro/scene"""
+  identifier: String
+
+  """
+  Whether it is in the collaboration only as what another object in it needs to be seen
+  """
+  brought: Boolean!
+}
+
+"""An object to put in, or take out of, a collaboration"""
+input CollaborationObjectInput {
+  collaboration: ID!
+
+  """The structure the object is known by: @mikro/scene"""
+  identifier: String!
+
+  """The object's id"""
+  object: ID!
+}
+
+"""A new collaboration"""
+input CreateCollaborationInput {
+  name: String!
+  description: String = null
+}
+
 """Date with time (isoformat)"""
 scalar DateTime
 
@@ -182,6 +235,24 @@ input JoinCallInput {
 }
 
 type Mutation {
+  """
+  Create an empty collaboration, to put agents and streams in and grant a guest
+  """
+  createCollaboration(input: CreateCollaborationInput!): Collaboration! @auth(any_role_of: ["admin", "editor"])
+
+  """
+  Put an agent or a stream in a collaboration: an agent brings every stream it offers
+  """
+  addToCollaboration(input: CollaborationObjectInput!): Collaboration! @auth(any_role_of: ["admin", "editor"])
+
+  """Take an agent or a stream out of a collaboration"""
+  removeFromCollaboration(input: CollaborationObjectInput!): Collaboration! @auth(any_role_of: ["admin", "editor"])
+
+  """
+  Delete a collaboration: whoever was granted it sees nothing of it any more
+  """
+  deleteCollaboration(id: ID!): ID! @auth(any_role_of: ["admin", "editor"])
+
   """
   Offer exactly these streams as the caller's agent: undeclared ones are removed, unchanged ones untouched
   """
@@ -193,12 +264,14 @@ type Mutation {
   publishToken: String!
 
   """
-  A token to watch a stream: its agent's room, where it is the track named by its key
+  A token to watch a stream: its agent's room, where it is the track named by its key. A guest needs the agent in one of their collaborations
   """
-  watchStream(input: WatchStreamInput!): String!
+  watchStream(input: WatchStreamInput!): String! @auth(allow_scoped: true)
 
-  """A token to watch every stream of an agent"""
-  watchAgent(input: WatchAgentInput!): String!
+  """
+  A token to watch every stream of an agent. A guest needs the agent in one of their collaborations
+  """
+  watchAgent(input: WatchAgentInput!): String! @auth(allow_scoped: true)
 
   """The live call about these structures, or a new one"""
   ensureCall(input: EnsureCallInput!): Call!
@@ -252,6 +325,14 @@ type Query {
   """The organization's calls; filter `live` for the ones in progress"""
   calls(filters: CallFilter, order: CallOrder, pagination: OffsetPaginationInput): [Call!]!
 
+  """
+  List the organization's collaborations: what a guest granted one sees of it (a guest: the collaborations granted to them)
+  """
+  collaborations: [Collaboration!]!
+
+  """Get a single collaboration by ID"""
+  collaboration(id: ID!): Collaboration!
+
   """Get a stream by ID"""
   stream(id: ID!): Stream!
 
@@ -272,7 +353,7 @@ type Release @key(fields: "id", resolvable: true) {
 }
 
 """One live source an agent offers: a camera, a detector, a microphone"""
-type Stream {
+type Stream @identified(by: "@lovekit/stream") {
   id: ID!
 
   """

{lovekit-4.0.0 → lovekit-4.2.0}/lovekit/api/schema.py

@@ -2,7 +2,7 @@ import builtins
 from enum import Enum
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field
 from rath.scalars import ID, IDCoercible
-from typing import Annotated, Iterable, Literal
+from typing import Annotated, ClassVar, Iterable, Literal
 
 
 class GraphQLDefault:
@@ -138,6 +138,7 @@ class WatchStreamInput(BaseModel):
 class StreamAgent(BaseModel):
     """An app instance that owns live streams: one per client, user and organization"""
 
+    __identifier__: ClassVar[Literal["@lovekit/agent"]] = "@lovekit/agent"
     typename: Literal["Agent"] = Field(
         alias="__typename", default="Agent", exclude=True
     )
@@ -150,6 +151,7 @@ class StreamAgent(BaseModel):
 class Stream(BaseModel):
     """One live source an agent offers: a camera, a detector, a microphone"""
 
+    __identifier__: ClassVar[Literal["@lovekit/stream"]] = "@lovekit/stream"
     typename: Literal["Stream"] = Field(
         alias="__typename", default="Stream", exclude=True
     )
@@ -191,6 +193,7 @@ class AgentUser(BaseModel):
 class Agent(BaseModel):
     """An app instance that owns live streams: one per client, user and organization"""
 
+    __identifier__: ClassVar[Literal["@lovekit/agent"]] = "@lovekit/agent"
     typename: Literal["Agent"] = Field(
         alias="__typename", default="Agent", exclude=True
     )
@@ -251,7 +254,7 @@ class WatchStreamMutation(BaseModel):
     """No documentation found for this operation."""
 
     watch_stream: str = Field(alias="watchStream")
-    "A token to watch a stream: its agent's room, where it is the track named by its key"
+    "A token to watch a stream: its agent's room, where it is the track named by its key. A guest needs the agent in one of their collaborations"
 
     class Arguments(BaseModel):
         """Arguments for WatchStream"""
@@ -268,7 +271,7 @@ class WatchAgentMutation(BaseModel):
     """No documentation found for this operation."""
 
     watch_agent: str = Field(alias="watchAgent")
-    "A token to watch every stream of an agent"
+    "A token to watch every stream of an agent. A guest needs the agent in one of their collaborations"
 
     class Arguments(BaseModel):
         """Arguments for WatchAgent"""
@@ -301,6 +304,7 @@ class GetAgentQuery(BaseModel):
 class SearchAgentsQueryOptions(BaseModel):
     """An app instance that owns live streams: one per client, user and organization"""
 
+    __identifier__: ClassVar[Literal["@lovekit/agent"]] = "@lovekit/agent"
     typename: Literal["Agent"] = Field(
         alias="__typename", default="Agent", exclude=True
     )
@@ -348,6 +352,7 @@ class GetStreamQuery(BaseModel):
 class IsStreamLiveQueryStream(BaseModel):
     """One live source an agent offers: a camera, a detector, a microphone"""
 
+    __identifier__: ClassVar[Literal["@lovekit/stream"]] = "@lovekit/stream"
     typename: Literal["Stream"] = Field(
         alias="__typename", default="Stream", exclude=True
     )
@@ -376,6 +381,7 @@ class IsStreamLiveQuery(BaseModel):
 class SearchStreamsQueryOptions(BaseModel):
     """One live source an agent offers: a camera, a detector, a microphone"""
 
+    __identifier__: ClassVar[Literal["@lovekit/stream"]] = "@lovekit/stream"
     typename: Literal["Stream"] = Field(
         alias="__typename", default="Stream", exclude=True
     )
@@ -493,7 +499,7 @@ class LovekitApi:
     async def awatch_stream(self, stream: IDCoercible) -> str:
         """WatchStream
 
-        A token to watch a stream: its agent's room, where it is the track named by its key
+        A token to watch a stream: its agent's room, where it is the track named by its key. A guest needs the agent in one of their collaborations
 
         Args:
             stream: The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID. (required)
@@ -510,7 +516,7 @@ class LovekitApi:
     def watch_stream(self, stream: IDCoercible) -> str:
         """WatchStream
 
-        A token to watch a stream: its agent's room, where it is the track named by its key
+        A token to watch a stream: its agent's room, where it is the track named by its key. A guest needs the agent in one of their collaborations
 
         Args:
             stream: The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID. (required)
@@ -527,7 +533,7 @@ class LovekitApi:
     async def awatch_agent(self, agent: IDCoercible) -> str:
         """WatchAgent
 
-        A token to watch every stream of an agent
+        A token to watch every stream of an agent. A guest needs the agent in one of their collaborations
 
         Args:
             agent: The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID. (required)
@@ -544,7 +550,7 @@ class LovekitApi:
     def watch_agent(self, agent: IDCoercible) -> str:
         """WatchAgent
 
-        A token to watch every stream of an agent
+        A token to watch every stream of an agent. A guest needs the agent in one of their collaborations
 
         Args:
             agent: The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID. (required)

{lovekit-4.0.0 → lovekit-4.2.0}/lovekit/arkitekt.py

@@ -57,8 +57,8 @@ def lovekit(
             link=LovekitLinkComposition(
                 auth=FaktsAuthLink(token_loader=tokens),
                 split=SplitLink(
-                    left=AIOHttpLink(endpoint_url=lovekit.to_http_path("graphql"), proxy=lovekit.proxy),
-                    right=GraphQLWSLink(ws_endpoint_url=lovekit.to_ws_path("graphql"), proxy=lovekit.proxy),
+                    left=AIOHttpLink(endpoint_url=lovekit.to_http_path("graphql"), proxy=lovekit.proxy, ssl_context=lovekit.ssl_context()),
+                    right=GraphQLWSLink(ws_endpoint_url=lovekit.to_ws_path("graphql"), proxy=lovekit.proxy, ssl_context=lovekit.ssl_context()),
                     split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
                 ),
             )

{lovekit-4.0.0 → lovekit-4.2.0}/lovekit/livekit.py

@@ -36,6 +36,12 @@ async def aroom_options(alias: Alias) -> tuple[str, Any]:
     from livekit import rtc
 
     if not alias.is_mesh():
+        # LiveKit's SDK (rustls) reads its roots only from SSL_CERT_FILE: a pinned
+        # SFU's hub certificate is added to them there.
+        if alias.is_pinned():
+            from arkitekt_spec.declare import tls
+
+            tls.trust_natively(alias.certificates)
         return alias.to_ws_path(), rtc.RoomOptions()
     local = await alias.aforward()
     turn = await alias.aturn()

{lovekit-4.0.0 → lovekit-4.2.0}/pyproject.toml

@@ -12,11 +12,11 @@ dependencies = [
     "numpy>=1.26",
     "rath>=4.1.1",
     # The service and structures are declared with arkitekt-spec.
-    "arkitekt-spec>=3.4",
+    "arkitekt-spec>=3.19.1",
     # The GraphQL-WS link the client subscribes through; it came through rekuest before.
     "websockets>=15.0.1",
     # The service wiring (Alias, Require, FaktsAuthLink); it came through rekuest before.
-    "fakts>=5.4",
+    "fakts>=6.1",
 ]
 
 [project.optional-dependencies]
@@ -30,6 +30,7 @@ dev-dependencies =  [
     "python-semantic-release>=9.21.0",
     "pytest-aiohttp>=1.0.4,<2",
     "ruff>0.11",
+    "turms>=2.3.0",
     "dokker>=2.8",
     "websockets>=15.0.1",
     "basedpyright>=1.21",