magic-pocket-cli 0.16.0__tar.gz → 0.17.0__tar.gz

{magic_pocket_cli-0.16.0 → magic_pocket_cli-0.17.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: magic-pocket-cli
-Version: 0.16.0
+Version: 0.17.0
 Summary: CLI and deploy tools for magic-pocket.
 Requires-Python: >=3.10
 Requires-Dist: awscrt>=0.19.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: deepdiff>=6.7.1
 Requires-Dist: jinja2>=3.1.3
-Requires-Dist: magic-pocket>=0.13.0
+Requires-Dist: magic-pocket>=0.17.0
 Requires-Dist: pathspec>=1.0.4
 Requires-Dist: python-on-whales>=0.68.0
 Requires-Dist: pyyaml>=6.0.1

{magic_pocket_cli-0.16.0 → magic_pocket_cli-0.17.0}/pocket_cli/cli/neon_cli.py

@@ -6,7 +6,7 @@ from pocket.context import Context
 from pocket.utils import echo
 from pocket_cli.cli.store_url_helper import run_store_url
 from pocket_cli.cli.url_helper import run_get_url
-from pocket_cli.resources.neon import Neon
+from pocket_cli.resources.neon import Neon, ensure_url_for_context
 
 
 @click.group()
@@ -83,13 +83,12 @@ def store_url(stage, key, force):
     """
 
     def ensure_and_compute_url(context):
-        neon = Neon(context.neon)
-        if not neon.branch:
-            neon.create_branch(neon.parent_branch)
-        neon.ensure_role()
-        neon.ensure_database()
-        # ensure 後の状態を確実に反映するため fresh instance で URL を算出する。
-        return Neon(context.neon).database_url
+        if not context.neon:
+            raise click.ClickException(
+                "neon が pocket.toml に宣言されていません (store-url 不可)"
+            )
+        # ensure + URL 算出は runtime package の共有ヘルパに一本化 (公開 API と同一経路)
+        return ensure_url_for_context(context.neon)
 
     run_store_url(
         stage=stage,

magic_pocket_cli-0.17.0/pocket_cli/resources/neon.py

@@ -0,0 +1,39 @@
+"""Neon リソースの後方互換 re-export。
+
+実装は runtime package の :mod:`pocket.provisioning.neon` に移設済み
+(20260712 feedback: 外部 provisioner が pocket.toml / pocket_cli なしで
+ensure + URL 算出を import 共有できるようにするため)。CLI 側の既存 import
+(`from pocket_cli.resources.neon import Neon` 等) はここで再エクスポートして維持する。
+"""
+
+from __future__ import annotations
+
+from pocket.provisioning.neon import (
+    Branch,
+    Database,
+    Endpoint,
+    Neon,
+    NeonApi,
+    NeonNotFound,
+    NeonResourceIsNotReady,
+    Project,
+    ResourceType,
+    Role,
+    ensure_and_compute_url,
+    ensure_url_for_context,
+)
+
+__all__ = [
+    "Branch",
+    "Database",
+    "Endpoint",
+    "Neon",
+    "NeonApi",
+    "NeonNotFound",
+    "NeonResourceIsNotReady",
+    "Project",
+    "ResourceType",
+    "Role",
+    "ensure_and_compute_url",
+    "ensure_url_for_context",
+]

{magic_pocket_cli-0.16.0 → magic_pocket_cli-0.17.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "magic-pocket-cli"
-version = "0.16.0"
+version = "0.17.0"
 description = "CLI and deploy tools for magic-pocket."
 requires-python = ">=3.10"
 dependencies = [
-    "magic-pocket>=0.13.0",
+    "magic-pocket>=0.17.0",
     "click>=8.1.7",
     "jinja2>=3.1.3",
     "python-on-whales>=0.68.0",

magic_pocket_cli-0.16.0/pocket_cli/resources/neon.py

@@ -1,392 +0,0 @@
-from __future__ import annotations
-
-import json
-import logging
-import os
-import re
-import time
-from functools import cached_property
-from typing import TYPE_CHECKING, Literal
-
-import requests
-from pydantic import BaseModel
-
-from pocket.resources.base import ResourceStatus
-
-if TYPE_CHECKING:
-    from pocket.context import NeonContext
-
-logging.basicConfig()
-logger = logging.getLogger(__name__)
-logger.setLevel(level=os.getenv("POCKET_LOGGER_LEVEL", "WARNING").upper())
-
-ResourceType = Literal["branches", "databases", "endpoints", "roles"]
-
-
-class NeonResourceIsNotReady(Exception):
-    pass
-
-
-class NeonNotFound(Exception):
-    """Neon API が 404 を返したことを示す例外。
-
-    `branch` / `role` などの個別取得で対象が存在しない場合にこの例外を投げる。
-    呼び出し側は存在しないことを明示的に判定できる。
-    """
-
-    pass
-
-
-class Project(BaseModel):
-    id: str
-    name: str
-
-
-class Branch(BaseModel):
-    id: str
-    name: str
-
-
-class Database(BaseModel):
-    name: str
-    owner_name: str
-
-
-class Endpoint(BaseModel):
-    id: str
-    host: str
-    autoscaling_limit_min_cu: float
-    autoscaling_limit_max_cu: float
-    type: Literal["read_write", "read_only"]
-
-
-class Role(BaseModel):
-    name: str
-    password: str | None = None
-
-
-class NeonApi:
-    endpoint = "https://console.neon.tech/api/v2/"
-
-    def __init__(self, key) -> None:
-        self.key = key
-
-    @property
-    def header(self):
-        return {
-            "Accept": "application/json",
-            "Authorization": "Bearer %s" % self.key,
-        }
-
-    def get(self, path):
-        logger.info("GET %s" % self.endpoint + path)
-        res = requests.get(self.endpoint + path, headers=self.header, timeout=30)
-        logger.debug(res.status_code)
-        logger.debug(json.dumps(res.json(), indent=2))
-        if 200 <= res.status_code < 300:
-            return res
-        if res.status_code == 404:
-            raise NeonNotFound("%s: %s" % (res.status_code, res.json()["message"]))
-        if res.status_code == 401:
-            print("Used API key: %s" % (self.key[:5] + "..." + self.key[-5:]))
-            print("API key length: %s" % len(self.key))
-        raise Exception("%s: %s" % (res.status_code, res.json()["message"]))
-
-    def post(self, path, data=None):
-        logger.warning("POST %s" % self.endpoint + path)
-        logger.debug(json.dumps(data, indent=2))
-        res = requests.post(
-            self.endpoint + path, headers=self.header, json=data, timeout=30
-        )
-        logger.debug(res.status_code)
-        logger.debug(json.dumps(res.json(), indent=2))
-        if 200 <= res.status_code < 300:
-            time.sleep(2)
-            return res
-        if res.status_code == 401:
-            print("Used API key: %s" % (self.key[:5] + "..." + self.key[-5:]))
-            print("API key length: %s" % len(self.key))
-        raise Exception("%s: %s" % (res.status_code, res.json()["message"]))
-
-    def delete(self, path, data=None):
-        logger.warning("DELETE %s" % self.endpoint + path)
-        logger.debug(json.dumps(data, indent=2))
-        res = requests.delete(
-            self.endpoint + path, headers=self.header, json=data, timeout=30
-        )
-        logger.debug(res.status_code)
-        logger.debug(json.dumps(res.json(), indent=2))
-        if 200 <= res.status_code < 300:
-            time.sleep(2)
-            return res
-        raise Exception("%s: %s" % (res.status_code, res.json()["message"]))
-
-    def projects_url(self):
-        return self.endpoint + "projects"
-
-
-class Neon:
-    context: NeonContext
-
-    def __init__(self, context: NeonContext) -> None:
-        self.context = context
-
-    def get_resource_path(self, resource_type: ResourceType) -> str:
-        requirements = {
-            "branches": ["project"],
-            "databases": ["project", "branch"],
-            "endpoints": ["project"],
-            "roles": ["project", "branch"],
-        }
-        path_templates = {
-            "branches": "projects/%(project_id)s/branches",
-            "databases": "projects/%(project_id)s/branches/%(branch_id)s/databases",
-            "endpoints": "projects/%(project_id)s/endpoints",
-            "roles": "projects/%(project_id)s/branches/%(branch_id)s/roles",
-        }
-        path_context = {}
-        for requirement in requirements[resource_type]:
-            if not getattr(self, requirement):
-                raise Exception("%s not found" % requirement)
-            path_context[requirement + "_id"] = getattr(self, requirement).id
-        return path_templates[resource_type] % path_context
-
-    def construct_path(
-        self, resource_type: ResourceType, resource_id: str | None = None
-    ):
-        path = self.get_resource_path(resource_type)
-        if resource_id:
-            path += "/" + resource_id
-        return path
-
-    def get(self, resource_type: ResourceType, resource_id: str | None = None):
-        path = self.construct_path(resource_type, resource_id)
-        return self.api.get(path)
-
-    def post(
-        self, resource_type: ResourceType, resource_id: str | None = None, data=None
-    ):
-        path = self.construct_path(resource_type, resource_id)
-        return self.api.post(path, data)
-
-    def delete(
-        self, resource_type: ResourceType, resource_id: str | None = None, data=None
-    ):
-        path = self.construct_path(resource_type, resource_id)
-        return self.api.delete(path, data)
-
-    @property
-    def api(self):
-        return NeonApi(self.context.api_key)
-
-    @cached_property
-    def role(self) -> Role | None:
-        if not self.branch:
-            return None
-        try:
-            res = self.get("roles", self.context.role_name)
-        except NeonNotFound:
-            return None
-        return Role(**res.json()["role"])
-
-    @cached_property
-    def project(self) -> Project:
-        """project_nameからNeonプロジェクトを解決する。
-
-        組織キー: GET /projects で一覧取得し name で検索。
-        プロジェクトスコープキー: エラーから project_id を取得し直接アクセス。
-        """
-        res = requests.get(
-            self.api.endpoint + "projects", headers=self.api.header, timeout=30
-        )
-        if 200 <= res.status_code < 300:
-            for p in res.json().get("projects", []):
-                if p["name"] == self.context.project_name:
-                    return Project(**p)
-            raise ValueError(f"Neon project '{self.context.project_name}' not found")
-
-        # プロジェクトスコープキー: エラーから project_id をパース
-        message = res.json().get("message", "")
-        match = re.search(r'subject_project_id:"([^"]+)"', message)
-        if not match:
-            raise ValueError(
-                f"Failed to resolve Neon project: {res.status_code}: {message}"
-            )
-        project_id = match.group(1)
-        project_res = self.api.get(f"projects/{project_id}")
-        project_data = project_res.json()["project"]
-        if project_data["name"] != self.context.project_name:
-            raise ValueError(
-                f"Neon project name mismatch: "
-                f"config='{self.context.project_name}', "
-                f"actual='{project_data['name']}'"
-            )
-        return Project(id=project_data["id"], name=project_data["name"])
-
-    @cached_property
-    def branch(self) -> Branch | None:
-        if self.project:
-            for branch in self.get("branches").json()["branches"]:
-                if branch["name"] == self.context.branch_name:
-                    return Branch(**branch)
-
-    @cached_property
-    def parent_branch(self) -> Branch | None:
-        """branch を新規作成する際の親ブランチ。
-
-        context.parent_branch_name が未指定なら None (= create_branch が parent_id を
-        送らず Neon の default ブランチから分岐)。指定があるのに project 内に該当
-        ブランチが無い場合はエラー (黙って default 分岐すると事故になるため)。
-        """
-        if not self.context.parent_branch_name:
-            return None
-        if self.project:
-            for branch in self.get("branches").json()["branches"]:
-                if branch["name"] == self.context.parent_branch_name:
-                    return Branch(**branch)
-        raise ValueError(
-            f"Neon parent branch '{self.context.parent_branch_name}' not found "
-            f"in project '{self.context.project_name}'"
-        )
-
-    @cached_property
-    def database(self) -> Database | None:
-        if self.branch:
-            for database in self.get("databases").json()["databases"]:
-                if database["name"] == self.context.name:
-                    return Database(**database)
-
-    @cached_property
-    def endpoint(self) -> Endpoint | None:
-        if self.branch:
-            for endpoint in self.get("endpoints").json()["endpoints"]:
-                if endpoint["branch_id"] == self.branch.id:
-                    return Endpoint(**endpoint)
-
-    @property
-    def database_url(self):
-        if self.role is None or self.endpoint is None:
-            raise NeonResourceIsNotReady("Create role and endpoint first")
-        if self.role.password is None:
-            self.set_role_password()
-        return "postgres://%s:%s@%s:5432/%s?sslmode=require" % (
-            self.context.role_name,
-            self.role.password,
-            self.endpoint.host,
-            self.context.name,
-        )
-
-    @property
-    def status(self) -> ResourceStatus:
-        # provisioning="command" の Neon は get_resources で除外されるため、ここに
-        # 到達するのは deploy が Neon を管理する provisioning="deploy" の場合のみ。
-        if self.working:
-            return "COMPLETED"
-        return "NOEXIST"
-
-    @property
-    def working(self):
-        check = [self.branch, self.database, self.endpoint, self.role]
-        logger.info(str(check))
-        return all(check)
-
-    @property
-    def description(self):
-        return "Create Neon branch, database, role, and endpoint"
-
-    def create_new(self):
-        self.create()
-        self.reset_database()
-
-    def state_info(self):
-        return {
-            "neon": {
-                "project_name": self.context.project_name,
-                "branch_name": self.context.branch_name,
-            }
-        }
-
-    def deploy_init(self):
-        pass
-
-    def create(self):
-        # branch が既に存在するなら (Neon project 作成時に自動生成される default main
-        # を含む) その上に role/database を ensure するだけにし branch 作成はスキップ。
-        # parent_branch の解決も branch 不在時のみ行う (存在するのに親を要求して誤って
-        # ValueError にしないため)。これで default main を使う stage の初回 deploy が
-        # 409 (branch already exists) にならず、既存 branch への db/role bootstrap も
-        # deploy で完結する。
-        if self.branch is None:
-            # parent_branch_name 指定時はその親から分岐。未指定なら parent_branch=None
-            # で従来通り Neon default ブランチから分岐する。
-            self.create_branch(self.parent_branch)
-        self.ensure_role()
-        self.ensure_database()
-
-    def create_branch(self, base_branch: Branch | None = None):
-        # 冪等化: context.branch_name の branch が既に存在するなら POST /branches は
-        # 409 (branch already exists) になるため作成をスキップする。branch_out /
-        # store_url の呼び出し側も branch 不在を確認済だが、直接呼ばれた場合の防御。
-        if self.branch is not None:
-            return
-        # branch/endpoint の cached_property を無効化し、branch 作成後の再取得を
-        # 強制する。endpoint はこの経路で一度も access していない (cache 未生成) ため
-        # 素の `del` は AttributeError になる。access 有無に依らず安全な pop で消す。
-        self.__dict__.pop("branch", None)
-        self.__dict__.pop("endpoint", None)
-        data = {
-            "branch": {
-                "name": self.context.branch_name,
-            },
-            "endpoints": [{"type": "read_write"}],
-        }
-        if base_branch:
-            data["branch"]["parent_id"] = base_branch.id
-        self.post("branches", data=data)
-
-    def delete_branch(self):
-        if not self.endpoint or not self.branch:
-            raise Exception("Branch or endpoint not found. Something is wrong.")
-        self.delete("endpoints", self.endpoint.id)
-        self.delete("branches", self.branch.id)
-
-    def ensure_database(self):
-        if self.database is None:
-            self.create_database()
-
-    def create_database(self):
-        if self.database is None:
-            del self.database
-        data = {
-            "database": {
-                "name": self.context.name,
-                "owner_name": self.context.role_name,
-            }
-        }
-        self.post("databases", data=data)
-
-    def reset_database(self):
-        if self.database:
-            self.delete("databases", self.context.name)
-        self.create_database()
-
-    def create_role(self):
-        if self.role is None:
-            del self.role
-        data = {"role": {"name": self.context.role_name}}
-        self.post("roles", data=data)
-
-    def set_role_password(self):
-        if self.role is None:
-            raise Exception("Create role first")
-        if self.role.password is None:
-            self.role.password = self.get(
-                "roles", self.role.name + "/reveal_password"
-            ).json()["password"]
-
-    def ensure_role(self):
-        if self.role is None:
-            del self.role
-            data = {"role": {"name": self.context.role_name}}
-            self.post("roles", data=data)
-            self.set_role_password()