Merge branch 'master' into graphql

bangumi · Sep 23, 2024 · c43d3c6 · c43d3c6
2 parents 9895178 + 2c4898c
commit c43d3c6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 43 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,6 +29,6 @@ RUN pip install -U pip && \
 
 WORKDIR /app
 
-ENTRYPOINT [ "python", "./start_grpc_server.py" ]
+ENTRYPOINT [ "python", "-m", "start_grpc_server" ]
 
 COPY . ./
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,12 +14,12 @@ pymysql = "1.1.1"
 pydantic = "2.9.2"
 pydantic-settings = "2.5.2"
 typing-extensions = '4.12.2'
-sslog = "0.0.0a45"
+sslog = "0.0.0a47"
 protobuf = "5.27.2"
 ariadne = "^0.23.0"
 uvicorn = { version = "^0.30.6", extras = ['standard'] }
 aiomysql = "^0.2.0"
-six = "^1.16.0"
+six = "1.16.0"
 
 [tool.poetry.group.dev.dependencies]
 sqlacodegen = "3.0.0rc5"

diff --git a/rpc/timeline_service.py b/rpc/timeline_service.py
@@ -193,7 +193,7 @@ def __episode_collect(self, req: EpisodeCollectRequest) -> EpisodeCollectRespons
             )
 
             if tl and tl.created_at >= int(time.time() - 15 * 60):
-                logger.info("find previous timeline, updating")
+                logger.info("find previous timeline, updating", user_id=req.user_id)
                 if (
                     tl.cat == TimelineCat.Progress
                     and tl.type == tlType
@@ -263,7 +263,7 @@ def __subject_progress(
             )
 
             if tl and tl.created_at >= int(time.time() - 15 * 60):
-                logger.info("find previous timeline, updating")
+                logger.info("find previous timeline, updating", user_id=req.user_id)
                 if (
                     tl.cat == TimelineCat.Progress
                     and tl.type == tlType

diff --git a/scripts/grpc_client.py b/scripts/grpc_client.py
@@ -1,41 +1,16 @@
 import grpc
+from sslog import logger
 
 from api.v1 import timeline_pb2_grpc
-from api.v1.timeline_pb2 import (
-    Episode,
-    EpisodeCollectRequest,
-    EpisodeCollectResponse,
-    Subject,
-)
+from api.v1.timeline_pb2 import HelloRequest
+from chii.config import config
 
 
 def run() -> None:
-    print("Will try to greet world ...")
-    with grpc.insecure_channel("127.0.0.1:5000") as channel:
+    logger.info("healthy check")
+    with grpc.insecure_channel(f"127.0.0.1:{config.grpc_port}") as channel:
         stub = timeline_pb2_grpc.TimeLineServiceStub(channel)
-        response: EpisodeCollectResponse = stub.EpisodeCollect(
-            EpisodeCollectRequest(
-                user_id=100,
-                last=Episode(
-                    name_cn="22",
-                    type=1,
-                    name="name",
-                    id=1,
-                    sort=1.4,
-                ),
-                subject=Subject(
-                    id=88,
-                    name="nn",
-                    image="image image",
-                    type=2,
-                    name_cn="name cn",
-                    series=False,
-                    eps_total=0,
-                    vols_total=0,
-                ),
-            )
-        )
-    print("Greeter client received:", response.ok)
+        stub.Hello(HelloRequest(name="client"))
 
 
 if __name__ == "__main__":