From df8f66b655849f6d63e3e0b7c4ae26ff1c466dd6 Mon Sep 17 00:00:00 2001 From: Yiping Kang Date: Mon, 9 Sep 2024 10:09:49 -0400 Subject: [PATCH] Rename inner import from jaclang_jaseci to jac_cloud too --- .gitignore | 1 + jac-cloud/docs/Jaseci.md | 6 +++--- jac-cloud/{jaclang_jaseci => jac_cloud}/__init__.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/core/__init__.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/core/architype.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/core/context.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/core/memory.py | 0 .../core/tests/test_architype.jac | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/__init__.py | 0 .../jaseci/datasources/__init__.py | 0 .../jaseci/datasources/collection.py | 0 .../jaseci/datasources/redis.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/dtos/__init__.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/dtos/sso.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/dtos/user.py | 0 .../jaseci/models/__init__.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/models/user.py | 0 .../jaseci/routers/__init__.py | 0 .../jaseci/routers/healthz.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/routers/sso.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/routers/user.py | 0 .../jaseci/security/__init__.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/sso/__init__.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/sso/apple.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/sso/google.py | 0 .../jaseci/utils/__init__.py | 0 .../{jaclang_jaseci => jac_cloud}/jaseci/utils/mail.py | 0 .../{jaclang_jaseci => jac_cloud}/plugin/__init__.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/plugin/cli.py | 2 +- jac-cloud/{jaclang_jaseci => jac_cloud}/plugin/jaseci.py | 0 jac-cloud/{jaclang_jaseci => jac_cloud}/tests/__init__.py | 0 .../tests/openapi_specs.json | 0 .../{jaclang_jaseci => jac_cloud}/tests/simple_graph.jac | 8 ++++---- .../tests/test_simple_graph.py | 2 +- jac-cloud/setup.py | 6 +++--- 35 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .gitignore rename jac-cloud/{jaclang_jaseci => jac_cloud}/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/core/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/core/architype.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/core/context.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/core/memory.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/core/tests/test_architype.jac (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/datasources/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/datasources/collection.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/datasources/redis.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/dtos/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/dtos/sso.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/dtos/user.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/models/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/models/user.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/routers/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/routers/healthz.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/routers/sso.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/routers/user.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/security/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/sso/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/sso/apple.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/sso/google.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/utils/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/jaseci/utils/mail.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/plugin/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/plugin/cli.py (97%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/plugin/jaseci.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/tests/__init__.py (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/tests/openapi_specs.json (100%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/tests/simple_graph.jac (97%) rename jac-cloud/{jaclang_jaseci => jac_cloud}/tests/test_simple_graph.py (99%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..c7ba5080fd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.jac_mypy_cache/ diff --git a/jac-cloud/docs/Jaseci.md b/jac-cloud/docs/Jaseci.md index 0e9036adcf..6838bda879 100644 --- a/jac-cloud/docs/Jaseci.md +++ b/jac-cloud/docs/Jaseci.md @@ -14,7 +14,7 @@ | {**kwargs} | any fields that's currently supported in `uvicorn.run` | N/A | N/A | ```python -import:py from jaclang_jaseci {FastAPI} +import:py from jac_cloud {FastAPI} with entry:__main__ { FastAPI.start( @@ -32,7 +32,7 @@ with entry:__main__ { - group will be based on allowed `methods` and `path` on specs - group 1: `/walker/{walker's name}` - group 2: `/walker/{walker's name}/{node}` -- to control enpoint specification, you need to declare inner `class __specs__ {}` or `obj __specs__ {}`. You may also use `@specs` from `jaclang_jaseci.plugin.jaseci.specs` if you have disabled auto endpoint +- to control enpoint specification, you need to declare inner `class __specs__ {}` or `obj __specs__ {}`. You may also use `@specs` from `jac_cloud.plugin.jaseci.specs` if you have disabled auto endpoint - walker support all kind of http method and all fastapi's supported object as path variable / query parameters / json body / file ## **Supported specs** @@ -46,7 +46,7 @@ with entry:__main__ { ## **Examples** ```python -import:py from jaclang_jaseci {FastAPI} +import:py from jac_cloud {FastAPI} walker post_no_body {} diff --git a/jac-cloud/jaclang_jaseci/__init__.py b/jac-cloud/jac_cloud/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/__init__.py rename to jac-cloud/jac_cloud/__init__.py diff --git a/jac-cloud/jaclang_jaseci/core/__init__.py b/jac-cloud/jac_cloud/core/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/core/__init__.py rename to jac-cloud/jac_cloud/core/__init__.py diff --git a/jac-cloud/jaclang_jaseci/core/architype.py b/jac-cloud/jac_cloud/core/architype.py similarity index 100% rename from jac-cloud/jaclang_jaseci/core/architype.py rename to jac-cloud/jac_cloud/core/architype.py diff --git a/jac-cloud/jaclang_jaseci/core/context.py b/jac-cloud/jac_cloud/core/context.py similarity index 100% rename from jac-cloud/jaclang_jaseci/core/context.py rename to jac-cloud/jac_cloud/core/context.py diff --git a/jac-cloud/jaclang_jaseci/core/memory.py b/jac-cloud/jac_cloud/core/memory.py similarity index 100% rename from jac-cloud/jaclang_jaseci/core/memory.py rename to jac-cloud/jac_cloud/core/memory.py diff --git a/jac-cloud/jaclang_jaseci/core/tests/test_architype.jac b/jac-cloud/jac_cloud/core/tests/test_architype.jac similarity index 100% rename from jac-cloud/jaclang_jaseci/core/tests/test_architype.jac rename to jac-cloud/jac_cloud/core/tests/test_architype.jac diff --git a/jac-cloud/jaclang_jaseci/jaseci/__init__.py b/jac-cloud/jac_cloud/jaseci/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/__init__.py rename to jac-cloud/jac_cloud/jaseci/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/datasources/__init__.py b/jac-cloud/jac_cloud/jaseci/datasources/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/datasources/__init__.py rename to jac-cloud/jac_cloud/jaseci/datasources/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/datasources/collection.py b/jac-cloud/jac_cloud/jaseci/datasources/collection.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/datasources/collection.py rename to jac-cloud/jac_cloud/jaseci/datasources/collection.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/datasources/redis.py b/jac-cloud/jac_cloud/jaseci/datasources/redis.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/datasources/redis.py rename to jac-cloud/jac_cloud/jaseci/datasources/redis.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/dtos/__init__.py b/jac-cloud/jac_cloud/jaseci/dtos/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/dtos/__init__.py rename to jac-cloud/jac_cloud/jaseci/dtos/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/dtos/sso.py b/jac-cloud/jac_cloud/jaseci/dtos/sso.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/dtos/sso.py rename to jac-cloud/jac_cloud/jaseci/dtos/sso.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/dtos/user.py b/jac-cloud/jac_cloud/jaseci/dtos/user.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/dtos/user.py rename to jac-cloud/jac_cloud/jaseci/dtos/user.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/models/__init__.py b/jac-cloud/jac_cloud/jaseci/models/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/models/__init__.py rename to jac-cloud/jac_cloud/jaseci/models/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/models/user.py b/jac-cloud/jac_cloud/jaseci/models/user.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/models/user.py rename to jac-cloud/jac_cloud/jaseci/models/user.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/routers/__init__.py b/jac-cloud/jac_cloud/jaseci/routers/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/routers/__init__.py rename to jac-cloud/jac_cloud/jaseci/routers/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/routers/healthz.py b/jac-cloud/jac_cloud/jaseci/routers/healthz.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/routers/healthz.py rename to jac-cloud/jac_cloud/jaseci/routers/healthz.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/routers/sso.py b/jac-cloud/jac_cloud/jaseci/routers/sso.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/routers/sso.py rename to jac-cloud/jac_cloud/jaseci/routers/sso.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/routers/user.py b/jac-cloud/jac_cloud/jaseci/routers/user.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/routers/user.py rename to jac-cloud/jac_cloud/jaseci/routers/user.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/security/__init__.py b/jac-cloud/jac_cloud/jaseci/security/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/security/__init__.py rename to jac-cloud/jac_cloud/jaseci/security/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/sso/__init__.py b/jac-cloud/jac_cloud/jaseci/sso/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/sso/__init__.py rename to jac-cloud/jac_cloud/jaseci/sso/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/sso/apple.py b/jac-cloud/jac_cloud/jaseci/sso/apple.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/sso/apple.py rename to jac-cloud/jac_cloud/jaseci/sso/apple.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/sso/google.py b/jac-cloud/jac_cloud/jaseci/sso/google.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/sso/google.py rename to jac-cloud/jac_cloud/jaseci/sso/google.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/utils/__init__.py b/jac-cloud/jac_cloud/jaseci/utils/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/utils/__init__.py rename to jac-cloud/jac_cloud/jaseci/utils/__init__.py diff --git a/jac-cloud/jaclang_jaseci/jaseci/utils/mail.py b/jac-cloud/jac_cloud/jaseci/utils/mail.py similarity index 100% rename from jac-cloud/jaclang_jaseci/jaseci/utils/mail.py rename to jac-cloud/jac_cloud/jaseci/utils/mail.py diff --git a/jac-cloud/jaclang_jaseci/plugin/__init__.py b/jac-cloud/jac_cloud/plugin/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/plugin/__init__.py rename to jac-cloud/jac_cloud/plugin/__init__.py diff --git a/jac-cloud/jaclang_jaseci/plugin/cli.py b/jac-cloud/jac_cloud/plugin/cli.py similarity index 97% rename from jac-cloud/jaclang_jaseci/plugin/cli.py rename to jac-cloud/jac_cloud/plugin/cli.py index 9f7fc04556..54a46abfb1 100644 --- a/jac-cloud/jaclang_jaseci/plugin/cli.py +++ b/jac-cloud/jac_cloud/plugin/cli.py @@ -20,7 +20,7 @@ def create_cmd() -> None: @cmd_registry.register def serve(filename: str, host: str = "0.0.0.0", port: int = 8000) -> None: - from jaclang_jaseci import FastAPI + from jac_cloud import FastAPI """Serve the jac application.""" base, mod = os.path.split(filename) diff --git a/jac-cloud/jaclang_jaseci/plugin/jaseci.py b/jac-cloud/jac_cloud/plugin/jaseci.py similarity index 100% rename from jac-cloud/jaclang_jaseci/plugin/jaseci.py rename to jac-cloud/jac_cloud/plugin/jaseci.py diff --git a/jac-cloud/jaclang_jaseci/tests/__init__.py b/jac-cloud/jac_cloud/tests/__init__.py similarity index 100% rename from jac-cloud/jaclang_jaseci/tests/__init__.py rename to jac-cloud/jac_cloud/tests/__init__.py diff --git a/jac-cloud/jaclang_jaseci/tests/openapi_specs.json b/jac-cloud/jac_cloud/tests/openapi_specs.json similarity index 100% rename from jac-cloud/jaclang_jaseci/tests/openapi_specs.json rename to jac-cloud/jac_cloud/tests/openapi_specs.json diff --git a/jac-cloud/jaclang_jaseci/tests/simple_graph.jac b/jac-cloud/jac_cloud/tests/simple_graph.jac similarity index 97% rename from jac-cloud/jaclang_jaseci/tests/simple_graph.jac rename to jac-cloud/jac_cloud/tests/simple_graph.jac index a29deb47d6..6ada8b3b2d 100644 --- a/jac-cloud/jaclang_jaseci/tests/simple_graph.jac +++ b/jac-cloud/jac_cloud/tests/simple_graph.jac @@ -1,8 +1,8 @@ """Example of simple walker walking nodes.""" -import:py from jaclang_jaseci.core.architype {BaseAnchor} -import:py from jaclang_jaseci.core.context {JaseciContext} -import:py from jaclang_jaseci.jaseci.models {User as BaseUser, NO_PASSWORD} -import:py from jaclang_jaseci.jaseci.utils {SendGridEmailer} +import:py from jac_cloud.core.architype {BaseAnchor} +import:py from jac_cloud.core.context {JaseciContext} +import:py from jac_cloud.jaseci.models {User as BaseUser, NO_PASSWORD} +import:py from jac_cloud.jaseci.utils {SendGridEmailer} import:py from dataclasses {dataclass} import:py from fastapi {UploadFile} diff --git a/jac-cloud/jaclang_jaseci/tests/test_simple_graph.py b/jac-cloud/jac_cloud/tests/test_simple_graph.py similarity index 99% rename from jac-cloud/jaclang_jaseci/tests/test_simple_graph.py rename to jac-cloud/jac_cloud/tests/test_simple_graph.py index 8a63053393..b49e8b3b58 100644 --- a/jac-cloud/jaclang_jaseci/tests/test_simple_graph.py +++ b/jac-cloud/jac_cloud/tests/test_simple_graph.py @@ -82,7 +82,7 @@ def trigger_openapi_specs_test(self) -> None: res = get(f"{self.host}/openapi.json", timeout=1) res.raise_for_status() - with open("jaclang_jaseci/tests/openapi_specs.json") as file: + with open("jac_cloud/tests/openapi_specs.json") as file: self.assertEqual(load(file), res.json()) def trigger_create_user_test(self, suffix: str = "") -> None: diff --git a/jac-cloud/setup.py b/jac-cloud/setup.py index fa4617ee00..7230c255ec 100644 --- a/jac-cloud/setup.py +++ b/jac-cloud/setup.py @@ -7,7 +7,7 @@ setup( name="jac-cloud", version=VERSION, - packages=find_packages(include=["jaclang_jaseci", "jaclang_jaseci.*"]), + packages=find_packages(include=["jac_cloud", "jac_cloud.*"]), install_requires=[ "jaclang~=0.7.17", "fastapi~=0.111.0", @@ -35,8 +35,8 @@ package_data={}, entry_points={ "jac": [ - "jac = jaclang_jaseci.plugin.jaseci:JacPlugin", - "serve = jaclang_jaseci.plugin.cli:JacCmd", + "jac = jac_cloud.plugin.jaseci:JacPlugin", + "serve = jac_cloud.plugin.cli:JacCmd", ], }, author="Jason Mars",