Merge pull request #3 from RyoJerryYu/feat-refactor-for-import-path

refactor: gen proto for import path
RyoJerryYu · Jun 9, 2024 · a6e88f4 · a6e88f4
2 parents 8217943 + 3c11575
commit a6e88f4
Show file tree

Hide file tree

Showing 42 changed files with 41 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ freeze:
 	@pip freeze > requirements.txt
 
 test:
-	@python -m unittest discover -p "*_test.py" src
+	@python -m unittest discover -p "*_test.py" memos_webhook
 
 .PHONY: package_build package_clean package_publish
 

diff --git a/main.py b/main.py
@@ -1,9 +1,9 @@
 import asyncio
 
-from src.app import app
-from src.dependencies.config import new_config
-from src.utils.logger import logger as util_logger
-from src.utils.logger import logging_config
+from memos_webhook.app import app
+from memos_webhook.dependencies.config import new_config
+from memos_webhook.utils.logger import logger as util_logger
+from memos_webhook.utils.logger import logging_config
 
 logger = util_logger.getChild("main")
 

diff --git a/memos_webhook/.gitattributes b/memos_webhook/.gitattributes
@@ -0,0 +1 @@
+proto_gen/** linguist-generated
diff --git a/proto/__init__.py → memos_webhook/__init__.py b/proto/__init__.py → memos_webhook/__init__.py
diff --git a/src/app.py → memos_webhook/app.py b/src/app.py → memos_webhook/app.py
@@ -6,16 +6,17 @@
 
 from fastapi import BackgroundTasks, Depends, FastAPI
 
-import proto.gen.memos.api.v1 as v1
-from src.dependencies.config import get_config, new_config
-from src.dependencies.memos_cli import MemosCli, get_memos_cli, new_memos_cli
-from src.dependencies.plugin_manager import (get_plugin_executor,
-                                             new_plugin_executor)
-from src.plugins.base_plugin import PluginExecutor
-from src.plugins.you_get_plugin import YouGetPlugin
-from src.utils.logger import logger as util_logger
-from src.utils.logger import logging_config
-from src.webhook.types.webhook_payload import WebhookPayload
+import memos_webhook.proto_gen.memos.api.v1 as v1
+from memos_webhook.dependencies.config import get_config, new_config
+from memos_webhook.dependencies.memos_cli import (MemosCli, get_memos_cli,
+                                                  new_memos_cli)
+from memos_webhook.dependencies.plugin_manager import (get_plugin_executor,
+                                                       new_plugin_executor)
+from memos_webhook.plugins.base_plugin import PluginExecutor
+from memos_webhook.plugins.you_get_plugin import YouGetPlugin
+from memos_webhook.utils.logger import logger as util_logger
+from memos_webhook.utils.logger import logging_config
+from memos_webhook.webhook.types.webhook_payload import WebhookPayload
 
 logger = util_logger.getChild("app")
 

diff --git a/src/dependencies/config.py → memos_webhook/dependencies/config.py b/src/dependencies/config.py → memos_webhook/dependencies/config.py
@@ -1,9 +1,11 @@
 from pydantic import BaseModel
 
-from src.utils.config_decorators import (ArgsConfigProvider, BaseArgsConfig,
-                                         BaseDotenvConfig, BaseUnmarshalConfig,
-                                         default, from_env, from_unmarshal,
-                                         it_is)
+from memos_webhook.utils.config_decorators import (ArgsConfigProvider,
+                                                   BaseArgsConfig,
+                                                   BaseDotenvConfig,
+                                                   BaseUnmarshalConfig,
+                                                   default, from_env,
+                                                   from_unmarshal, it_is)
 
 
 class YouGetPluginConfig(BaseModel):

diff --git a/src/dependencies/memos_cli.py → memos_webhook/dependencies/memos_cli.py b/src/dependencies/memos_cli.py → memos_webhook/dependencies/memos_cli.py
@@ -3,8 +3,8 @@
 
 from grpclib.client import Channel
 
-import proto.gen.memos.api.v1 as v1
-from src.utils.logger import logger as util_logger
+import memos_webhook.proto_gen.memos.api.v1 as v1
+from memos_webhook.utils.logger import logger as util_logger
 
 from .config import Config
 

diff --git a/src/dependencies/plugin_manager.py → memos_webhook/dependencies/plugin_manager.py b/src/dependencies/plugin_manager.py → memos_webhook/dependencies/plugin_manager.py
@@ -1,5 +1,5 @@
-from src.plugins.base_plugin import PluginExecutor, PluginProtocol
-from src.plugins.you_get_plugin import YouGetPlugin
+from memos_webhook.plugins.base_plugin import PluginExecutor, PluginProtocol
+from memos_webhook.plugins.you_get_plugin import YouGetPlugin
 
 from .config import Config, PluginConfig, YouGetPluginConfig
 from .memos_cli import MemosCli

diff --git a/proto/gen/__init__.py → memos_webhook/plugins/__init__.py b/proto/gen/__init__.py → memos_webhook/plugins/__init__.py
diff --git a/src/plugins/base_plugin.py → memos_webhook/plugins/base_plugin.py b/src/plugins/base_plugin.py → memos_webhook/plugins/base_plugin.py
@@ -4,10 +4,10 @@
 
 import betterproto.lib.google.protobuf as pb
 
-from proto.gen.memos.api import v1
-from src.dependencies.memos_cli import MemosCli
-from src.utils.logger import logger
-from src.webhook.types.webhook_payload import WebhookPayload
+from memos_webhook.dependencies.memos_cli import MemosCli
+from memos_webhook.proto_gen.memos.api import v1
+from memos_webhook.utils.logger import logger
+from memos_webhook.webhook.types.webhook_payload import WebhookPayload
 
 pluginLogger = logger.getChild("plugin")
 

diff --git a/src/plugins/base_plugin_test.py → memos_webhook/plugins/base_plugin_test.py b/src/plugins/base_plugin_test.py → memos_webhook/plugins/base_plugin_test.py
@@ -1,10 +1,10 @@
 import unittest
 from typing import TypedDict, override
 
-import src.webhook.types.memo_service as webhook_types
-from proto.gen.memos.api import v1
-from src.dependencies.memos_cli import MemosCli
-from src.webhook.types.webhook_payload import WebhookPayload
+import memos_webhook.webhook.types.memo_service as webhook_types
+from memos_webhook.dependencies.memos_cli import MemosCli
+from memos_webhook.proto_gen.memos.api import v1
+from memos_webhook.webhook.types.webhook_payload import WebhookPayload
 
 from .base_plugin import BasePlugin
 

diff --git a/src/plugins/you_get_plugin.py → memos_webhook/plugins/you_get_plugin.py b/src/plugins/you_get_plugin.py → memos_webhook/plugins/you_get_plugin.py
@@ -8,10 +8,10 @@
 import aiofiles.os
 import betterproto.lib.google.protobuf as pb
 
-from proto.gen.memos.api import v1
-from src.dependencies.config import YouGetPluginConfig
-from src.dependencies.memos_cli import MemosCli
-from src.webhook.types.webhook_payload import WebhookPayload
+from memos_webhook.dependencies.config import YouGetPluginConfig
+from memos_webhook.dependencies.memos_cli import MemosCli
+from memos_webhook.proto_gen.memos.api import v1
+from memos_webhook.webhook.types.webhook_payload import WebhookPayload
 
 from .base_plugin import BasePlugin, pluginLogger
 

diff --git a/src/plugins/you_get_plugin_test.py → memos_webhook/plugins/you_get_plugin_test.py b/src/plugins/you_get_plugin_test.py → memos_webhook/plugins/you_get_plugin_test.py
diff --git a/proto/gen/google/__init__.py → memos_webhook/proto_gen/google/__init__.py b/proto/gen/google/__init__.py → memos_webhook/proto_gen/google/__init__.py
diff --git a/proto/gen/google/api/__init__.py → ..._webhook/proto_gen/google/api/__init__.py b/proto/gen/google/api/__init__.py → ..._webhook/proto_gen/google/api/__init__.py
diff --git a/proto/gen/memos/__init__.py → memos_webhook/proto_gen/memos/__init__.py b/proto/gen/memos/__init__.py → memos_webhook/proto_gen/memos/__init__.py
diff --git a/proto/gen/memos/api/__init__.py → ...s_webhook/proto_gen/memos/api/__init__.py b/proto/gen/memos/api/__init__.py → ...s_webhook/proto_gen/memos/api/__init__.py
diff --git a/proto/gen/memos/api/v1/__init__.py → ...ebhook/proto_gen/memos/api/v1/__init__.py b/proto/gen/memos/api/v1/__init__.py → ...ebhook/proto_gen/memos/api/v1/__init__.py
diff --git a/src/__init__.py → memos_webhook/utils/__init__.py b/src/__init__.py → memos_webhook/utils/__init__.py
diff --git a/src/utils/config_decorators/__init__.py → ...bhook/utils/config_decorators/__init__.py b/src/utils/config_decorators/__init__.py → ...bhook/utils/config_decorators/__init__.py
diff --git a/src/utils/config_decorators/common.py → ...webhook/utils/config_decorators/common.py b/src/utils/config_decorators/common.py → ...webhook/utils/config_decorators/common.py
diff --git a/src/utils/config_decorators/from_args.py → ...hook/utils/config_decorators/from_args.py b/src/utils/config_decorators/from_args.py → ...hook/utils/config_decorators/from_args.py
diff --git a/...utils/config_decorators/from_args_test.py → ...utils/config_decorators/from_args_test.py b/...utils/config_decorators/from_args_test.py → ...utils/config_decorators/from_args_test.py
diff --git a/src/utils/config_decorators/from_env.py → ...bhook/utils/config_decorators/from_env.py b/src/utils/config_decorators/from_env.py → ...bhook/utils/config_decorators/from_env.py
diff --git a/src/utils/config_decorators/from_env_test.py → .../utils/config_decorators/from_env_test.py b/src/utils/config_decorators/from_env_test.py → .../utils/config_decorators/from_env_test.py
diff --git a/...utils/config_decorators/from_unmarshal.py → ...utils/config_decorators/from_unmarshal.py b/...utils/config_decorators/from_unmarshal.py → ...utils/config_decorators/from_unmarshal.py
diff --git a/.../config_decorators/from_unmarshal_test.py → .../config_decorators/from_unmarshal_test.py b/.../config_decorators/from_unmarshal_test.py → .../config_decorators/from_unmarshal_test.py
diff --git a/src/utils/logger.py → memos_webhook/utils/logger.py b/src/utils/logger.py → memos_webhook/utils/logger.py
diff --git a/src/plugins/__init__.py → memos_webhook/webhook/__init__.py b/src/plugins/__init__.py → memos_webhook/webhook/__init__.py
diff --git a/src/utils/__init__.py → memos_webhook/webhook/types/__init__.py b/src/utils/__init__.py → memos_webhook/webhook/types/__init__.py
diff --git a/src/webhook/types/common.py → memos_webhook/webhook/types/common.py b/src/webhook/types/common.py → memos_webhook/webhook/types/common.py
diff --git a/src/webhook/types/google_protobuf.py → ..._webhook/webhook/types/google_protobuf.py b/src/webhook/types/google_protobuf.py → ..._webhook/webhook/types/google_protobuf.py
diff --git a/src/webhook/types/markdown_service.py → ...webhook/webhook/types/markdown_service.py b/src/webhook/types/markdown_service.py → ...webhook/webhook/types/markdown_service.py
diff --git a/src/webhook/types/memo_relation_service.py → ...ok/webhook/types/memo_relation_service.py b/src/webhook/types/memo_relation_service.py → ...ok/webhook/types/memo_relation_service.py
diff --git a/src/webhook/types/memo_service.py → memos_webhook/webhook/types/memo_service.py b/src/webhook/types/memo_service.py → memos_webhook/webhook/types/memo_service.py
diff --git a/src/webhook/types/reaction.py → memos_webhook/webhook/types/reaction.py b/src/webhook/types/reaction.py → memos_webhook/webhook/types/reaction.py
diff --git a/src/webhook/types/resource_service.py → ...webhook/webhook/types/resource_service.py b/src/webhook/types/resource_service.py → ...webhook/webhook/types/resource_service.py
diff --git a/src/webhook/types/webhook_payload.py → ..._webhook/webhook/types/webhook_payload.py b/src/webhook/types/webhook_payload.py → ..._webhook/webhook/types/webhook_payload.py
diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
@@ -13,4 +13,4 @@ plugins:
   # https://github.com/danielgtaylor/python-betterproto/issues/574
   - local: protoc-gen-python_betterproto
     # https://github.com/danielgtaylor/python-betterproto
-    out: gen
+    out: ../memos_webhook/proto_gen
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,5 +26,5 @@ dependencies = { file = ["requirements.txt"] }
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["proto*", "src*"]
+include = ["proto*", "memos_webhook*"]
 exclude = ["*_test.py"]
diff --git a/src/webhook/__init__.py b/src/webhook/__init__.py
diff --git a/src/webhook/types/__init__.py b/src/webhook/types/__init__.py