Add timeout to apex (#7)

* Squashed 'protos/' changes from dd4bc46..a643df8

a643df8 Merge pull request #8 from macrocosm-os/gen-1139_add_auth_timing
1797152 GEN-1139 Improve auth and usage tracking
35cff72 Merge pull request #7 from macrocosm-os/gen-964-sub-reddits-secrets
cf2273b Finalize ListTopics endpoint Rename protobuf definitions Rm gravity_api.go
5ed889b Finalize ListTopics endpoint Rename protobuf definitions Rm gravity_api.go
090da56 Introduce SN13 service
b68b65f Add endpoint for validating sources (i.e. getting top labels by source)
7fbb132 Merge pull request #6 from macrocosm-os/codeowners
e0ceca8 codeowners

git-subtree-dir: protos
git-subtree-split: a643df86c68b9376d7415953d2ca3aca440133de

* Add timeout to Apex client

Author: cassova

examples/apex_chat_client_async.py

@@ -7,8 +7,6 @@
 import time
 from typing import List
 
-import grpc
-
 import macrocosmos as mc
 
 
@@ -90,7 +88,7 @@ async def process_chat_completion(
 
         return duration
 
-    except grpc.RpcError as e:
+    except Exception as e:
         duration = time.time() - start_time
         print(
             f"RPC error in request {index} (after {duration:.2f}s): {e.code()}: {e.details()}"

examples/apex_chat_client_stream.py

@@ -5,8 +5,6 @@
 import asyncio
 import os
 
-import grpc
-
 import macrocosmos as mc
 
 
@@ -52,7 +50,7 @@ async def demo_chat_completion_stream():
                 full_content += content
                 print(content, end="", flush=True)
 
-    except grpc.RpcError as e:
+    except Exception as e:
         print(f"RPC error: {e.code()}: {e.details()}")
 
 

examples/apex_chat_client_sync.py

@@ -6,8 +6,6 @@
 import time
 from typing import List
 
-import grpc
-
 import macrocosmos as mc
 
 
@@ -87,7 +85,7 @@ def process_chat_completion(
 
         return duration
 
-    except grpc.RpcError as e:
+    except Exception as e:
         duration = time.time() - start_time
         print(
             f"RPC error in request {index} (after {duration:.2f}s): {e.code()}: {e.details()}"

examples/apex_chat_grpc.py

@@ -11,7 +11,7 @@
 import grpc
 
 from macrocosmos import __package_name__, __version__
-from macrocosmos.client import DEFAULT_BASE_URL
+from macrocosmos.resources._client import DEFAULT_BASE_URL
 from macrocosmos.generated.apex.v1 import apex_pb2, apex_pb2_grpc
 
 

protos/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+*   @cassova @metafeather
+/.github/CODEOWNERS @cassova @metafeather

protos/README.md

@@ -2,14 +2,26 @@
 Protobufs used by Macrocosmos products
 
 # Usage
-Here is an example of how to add the Macrocosmos protobufs to a project:
+Here are instructions on how to add and update the protos from your own project repo.
+
+> ⚠️ These commands must be run from the target repo's root directory
+
+How to add the Macrocosmos protobufs to a project repo:
 
 ```bash
 git subtree add --prefix=protos git@github.com:macrocosm-os/macrocosmos-protos.git main --squash
 ```
 
-They can subsequently be updated with:
+You can pull the latest updates to `main` from this repo to your project repo with:
 
 ```bash
 git subtree pull --prefix=protos git@github.com:macrocosm-os/macrocosmos-protos.git main --squash
 ```
+
+To push changes back to this repo for other projects, run this to create a branch:
+
+```bash
+git subtree push --prefix=protos git@github.com:macrocosm-os/macrocosmos-protos.git <your-branch-name>
+```
+
+You'll then need to create a pull request for that branch to merge to `main`.

protos/apex/v1/apex.proto

@@ -40,6 +40,8 @@ message ChatCompletionRequest {
   bool json_format = 10;
   // stream: whether to stream the completion.
   bool stream = 11;
+  // timeout: the timeout for the completion in seconds.
+  int64 timeout = 12;
 }
 
 // The sampling parameters for the completion.
@@ -333,6 +335,8 @@ message WebRetrievalRequest {
   int64 n_results = 4;
   // max_response_time: the max response time to allow for the miners to respond in seconds.
   int64 max_response_time = 5;
+  // timeout: the timeout for the web retrieval in seconds.
+  int64 timeout = 6;
 }
 
 // A web search result from Apex

protos/sn13/v1/sn13_validator.proto

@@ -0,0 +1,34 @@
+syntax = "proto3";
+
+package sn13.v1;
+
+
+option go_package = "macrocosm-os/rift/constellation_api/gen/sn13/v1";
+
+
+service Sn13Service {
+  // ListTopics is the RPC method for getting the top topics
+  rpc ListTopics(ListTopicsRequest) returns (ListTopicsResponse);
+}
+
+// ListTopicsRequest is the request message for getting the top topics
+message ListTopicsRequest {
+  // source: the source to validate
+  string source = 1;
+}
+
+// ListTopicsResponseDetail is the response message for getting the top topics
+message ListTopicsResponseDetail {
+    // label_value: reddit or x topic
+    string label_value = 1;
+    // content_size_bytes: content size in bytes
+    uint64 content_size_bytes = 2;
+    // adj_content_size_bytes: adjacent content size in bytes
+    uint64 adj_content_size_bytes = 3;
+}
+
+// ListTopicsResponse is a list of ListTopicsResponseDetail(s) with top topics
+message ListTopicsResponse {
+  // message: the response message
+  repeated ListTopicsResponseDetail details = 1;
+}

src/macrocosmos/generated/apex/v1/apex_p2p.py

@@ -2,10 +2,10 @@
 # gen by protobuf_to_pydantic[v0.3.1.1](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 5.29.4 
 # Pydantic Version: 2.11.0 
-import typing
-
 from google.protobuf.message import Message  # type: ignore
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
+from pydantic import Field
+import typing
 
 
 class ChatMessage(BaseModel):
@@ -64,6 +64,8 @@ class ChatCompletionRequest(BaseModel):
     json_format: bool = Field(default=False)
 # stream: whether to stream the completion.
     stream: bool = Field(default=False)
+# timeout: the timeout for the completion in seconds.
+    timeout: int = Field(default=0)
 
 class TopLogprob(BaseModel):
     """
@@ -375,6 +377,8 @@ class WebRetrievalRequest(BaseModel):
     n_results: int = Field(default=0)
 # max_response_time: the max response time to allow for the miners to respond in seconds.
     max_response_time: int = Field(default=0)
+# timeout: the timeout for the web retrieval in seconds.
+    timeout: int = Field(default=0)
 
 class WebSearchResult(BaseModel):
     """