nonebot-plugin-awsmgmt 0.1.1__tar.gz → 0.1.2__tar.gz

{nonebot_plugin_awsmgmt-0.1.1 → nonebot_plugin_awsmgmt-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-awsmgmt
-Version: 0.1.1
+Version: 0.1.2
 Summary: A nonebot2 plugin for managing AWS EC2, Lightsail, and Cost Explorer via commands.
 Author-email: Maximilian Wu <me@maxng.cc>
 Requires-Python: >=3.8
@@ -10,10 +10,37 @@ Description-Content-Type: text/markdown
 
 # nonebot_plugin_awsmgmt
 
-A NoneBot2 plugin for AWS management.
+一个用于 AWS 管理的 NoneBot2 插件。
 
 ## 使用方法
 
+---
+### EC2
+- `/ec2_start [target]`
+- `/ec2_stop [target]`
+- `/ec2_reboot [target]`
+- `/ec2_status [target]`
+
+**Target (目标):**
+- `tag:Key:Value`:  例如 `tag:Project:MyProject`
+- `id:i-xxxx`: 例如 `id:i-0fd0acc80b595ac71`
+
+如果未提供 `target`，插件将使用您在配置中设置的 `aws_default_target_tag`（如果已设置）。
+
+---
+### Lightsail
+- `/lightsail_list`
+- `/lightsail_start <实例名称>`
+- `/lightsail_stop <实例名称>`
+
+---
+### Cost Explorer (成本管理器)
+- `/aws_cost today` (今日成本)
+- `/aws_cost month` (本月成本)
+- `/aws_cost month by_service` (按服务划分的本月成本)
+
+## 安装
+
 1.  **安装插件**
 
     ```bash
@@ -33,12 +60,12 @@ A NoneBot2 plugin for AWS management.
 
 3.  **配置 AWS 凭证**
 
-    在 NoneBot2 项目的 `.env` 文件中配置 AWS 访问密钥和秘密访问密钥：
+    在您的 NoneBot2 项目的 `.env` 文件中配置您的 AWS 访问密钥和秘密访问密钥：
 
     ```
     AWS_ACCESS_KEY_ID=YOUR_AWS_ACCESS_KEY_ID
     AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY
-    AWS_REGION_NAME=your-aws-region # 例如：us-east-1
+    AWS_REGION_NAME=your-aws-region # 例如: us-east-1
     ```
 
 ## AWS 侧配置

{nonebot_plugin_awsmgmt-0.1.1 → nonebot_plugin_awsmgmt-0.1.2}/README.md

@@ -1,9 +1,36 @@
 # nonebot_plugin_awsmgmt
 
-A NoneBot2 plugin for AWS management.
+一个用于 AWS 管理的 NoneBot2 插件。
 
 ## 使用方法
 
+---
+### EC2
+- `/ec2_start [target]`
+- `/ec2_stop [target]`
+- `/ec2_reboot [target]`
+- `/ec2_status [target]`
+
+**Target (目标):**
+- `tag:Key:Value`:  例如 `tag:Project:MyProject`
+- `id:i-xxxx`: 例如 `id:i-0fd0acc80b595ac71`
+
+如果未提供 `target`，插件将使用您在配置中设置的 `aws_default_target_tag`（如果已设置）。
+
+---
+### Lightsail
+- `/lightsail_list`
+- `/lightsail_start <实例名称>`
+- `/lightsail_stop <实例名称>`
+
+---
+### Cost Explorer (成本管理器)
+- `/aws_cost today` (今日成本)
+- `/aws_cost month` (本月成本)
+- `/aws_cost month by_service` (按服务划分的本月成本)
+
+## 安装
+
 1.  **安装插件**
 
     ```bash
@@ -23,12 +50,12 @@ A NoneBot2 plugin for AWS management.
 
 3.  **配置 AWS 凭证**
 
-    在 NoneBot2 项目的 `.env` 文件中配置 AWS 访问密钥和秘密访问密钥：
+    在您的 NoneBot2 项目的 `.env` 文件中配置您的 AWS 访问密钥和秘密访问密钥：
 
     ```
     AWS_ACCESS_KEY_ID=YOUR_AWS_ACCESS_KEY_ID
     AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY
-    AWS_REGION_NAME=your-aws-region # 例如：us-east-1
+    AWS_REGION_NAME=your-aws-region # 例如: us-east-1
     ```
 
 ## AWS 侧配置

{nonebot_plugin_awsmgmt-0.1.1 → nonebot_plugin_awsmgmt-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-awsmgmt"
-version = "0.1.1"
+version = "0.1.2"
 description = "A nonebot2 plugin for managing AWS EC2, Lightsail, and Cost Explorer via commands."
 authors = [
     { name = "Maximilian Wu", email = "me@maxng.cc" }

{nonebot_plugin_awsmgmt-0.1.1 → nonebot_plugin_awsmgmt-0.1.2}/src/nonebot_plugin_awsmgmt/__init__.py

@@ -103,6 +103,62 @@ def format_ec2_status(instance: Dict[str, Any]) -> str:
 
 # --- EC2 Handlers --- #
 
+async def ec2_operation(matcher: Matcher, args: Message, operation: str):
+    """Helper function to handle EC2 start, stop, and reboot operations."""
+    target_type, value1, value2 = await parse_ec2_target(matcher, args)
+
+    states_map = {
+        "start": (["stopped"], "running", "start_instances", "instance_running"),
+        "stop": (["running"], "stopped", "stop_instances", "instance_stopped"),
+        "reboot": (["running"], "running", "reboot_instances", None), # Reboot does not have a waiter
+    }
+
+    if operation not in states_map:
+        await matcher.finish("Invalid operation.")
+
+    states, target_status, op_func_name, waiter_name = states_map[operation]
+
+    if target_type == "tag":
+        instances = await ec2_manager.get_instances_by_tag(value1, value2, states=states)
+    else:
+        instances = await ec2_manager.get_instances_by_id([value1], states=states)
+
+    if not instances:
+        await matcher.finish(f"No instances to {operation}.")
+
+    instance_ids = [inst['InstanceId'] for inst in instances]
+    await matcher.send(f"Sending {operation} command to instances:\n" + "\n".join(instance_ids))
+
+    op_func = getattr(ec2_manager, op_func_name)
+    await op_func(instance_ids)
+
+    if waiter_name:
+        await matcher.send("Waiting for them to be " + ("rebooted" if operation == "reboot" else f"{target_status}..."))
+        start_time = time.time()
+        async with ec2_manager.session.client("ec2") as ec2:
+            waiter = ec2.get_waiter(waiter_name)
+            await waiter.wait(InstanceIds=instance_ids)
+        elapsed_time = time.time() - start_time
+        await matcher.finish(f"Successfully {operation}ed instances in {elapsed_time:.2f} seconds.")
+    else: # For reboot
+        await matcher.finish(f"Successfully sent reboot command to instances.")
+
+
+@ec2_start_matcher.handle()
+@handle_non_finish_exceptions("An error occurred while starting EC2 instances.")
+async def handle_ec2_start(matcher: Matcher, args: Message = CommandArg()):
+    await ec2_operation(matcher, args, "start")
+
+@ec2_stop_matcher.handle()
+@handle_non_finish_exceptions("An error occurred while stopping EC2 instances.")
+async def handle_ec2_stop(matcher: Matcher, args: Message = CommandArg()):
+    await ec2_operation(matcher, args, "stop")
+
+@ec2_reboot_matcher.handle()
+@handle_non_finish_exceptions("An error occurred while rebooting EC2 instances.")
+async def handle_ec2_reboot(matcher: Matcher, args: Message = CommandArg()):
+    await ec2_operation(matcher, args, "reboot")
+
 @ec2_status_matcher.handle()
 @handle_non_finish_exceptions("An error occurred while fetching EC2 status.")
 async def handle_ec2_status(matcher: Matcher, args: Message = CommandArg()):
@@ -123,6 +179,7 @@ async def handle_ec2_status(matcher: Matcher, args: Message = CommandArg()):
 
 # --- Lightsail Handlers ---
 
+
 @lightsail_list_matcher.handle()
 @handle_non_finish_exceptions("An error occurred listing Lightsail instances.")
 async def handle_lightsail_list(matcher: Matcher):