fix: auto-fix code issues (cron)
- 修复重复导入/字段 - 修复异常处理 - 修复PEP8格式问题 - 添加类型注解 - 修复重复函数定义 (health_check, create_webhook_endpoint, etc) - 修复未定义名称 (SearchOperator, TenantTier, Query, Body, logger) - 修复 workflow_manager.py 的类定义重复问题 - 添加缺失的导入
This commit is contained in:
@@ -10,24 +10,22 @@ InsightFlow Phase 8 Task 1 - 多租户 SaaS 架构测试脚本
|
||||
5. 资源使用统计
|
||||
"""
|
||||
|
||||
from tenant_manager import (
|
||||
get_tenant_manager
|
||||
)
|
||||
import sys
|
||||
import os
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from tenant_manager import (
|
||||
get_tenant_manager, TenantManager, Tenant, TenantDomain,
|
||||
TenantBranding, TenantMember, TenantRole, TenantStatus, TenantTier
|
||||
)
|
||||
|
||||
|
||||
def test_tenant_management():
|
||||
"""测试租户管理功能"""
|
||||
print("=" * 60)
|
||||
print("测试 1: 租户管理")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 1. 创建租户
|
||||
print("\n1.1 创建租户...")
|
||||
tenant = manager.create_tenant(
|
||||
@@ -42,19 +40,19 @@ def test_tenant_management():
|
||||
print(f" - 层级: {tenant.tier}")
|
||||
print(f" - 状态: {tenant.status}")
|
||||
print(f" - 资源限制: {tenant.resource_limits}")
|
||||
|
||||
|
||||
# 2. 获取租户
|
||||
print("\n1.2 获取租户信息...")
|
||||
fetched = manager.get_tenant(tenant.id)
|
||||
assert fetched is not None, "获取租户失败"
|
||||
print(f"✅ 获取租户成功: {fetched.name}")
|
||||
|
||||
|
||||
# 3. 通过 slug 获取
|
||||
print("\n1.3 通过 slug 获取租户...")
|
||||
by_slug = manager.get_tenant_by_slug(tenant.slug)
|
||||
assert by_slug is not None, "通过 slug 获取失败"
|
||||
print(f"✅ 通过 slug 获取成功: {by_slug.name}")
|
||||
|
||||
|
||||
# 4. 更新租户
|
||||
print("\n1.4 更新租户信息...")
|
||||
updated = manager.update_tenant(
|
||||
@@ -64,12 +62,12 @@ def test_tenant_management():
|
||||
)
|
||||
assert updated is not None, "更新租户失败"
|
||||
print(f"✅ 租户更新成功: {updated.name}, 层级: {updated.tier}")
|
||||
|
||||
|
||||
# 5. 列出租户
|
||||
print("\n1.5 列出租户...")
|
||||
tenants = manager.list_tenants(limit=10)
|
||||
print(f"✅ 找到 {len(tenants)} 个租户")
|
||||
|
||||
|
||||
return tenant.id
|
||||
|
||||
|
||||
@@ -78,9 +76,9 @@ def test_domain_management(tenant_id: str):
|
||||
print("\n" + "=" * 60)
|
||||
print("测试 2: 域名管理")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 1. 添加域名
|
||||
print("\n2.1 添加自定义域名...")
|
||||
domain = manager.add_domain(
|
||||
@@ -92,19 +90,19 @@ def test_domain_management(tenant_id: str):
|
||||
print(f" - ID: {domain.id}")
|
||||
print(f" - 状态: {domain.status}")
|
||||
print(f" - 验证令牌: {domain.verification_token}")
|
||||
|
||||
|
||||
# 2. 获取验证指导
|
||||
print("\n2.2 获取域名验证指导...")
|
||||
instructions = manager.get_domain_verification_instructions(domain.id)
|
||||
print(f"✅ 验证指导:")
|
||||
print(f" - DNS 记录: {instructions['dns_record']}")
|
||||
print(f" - 文件验证: {instructions['file_verification']}")
|
||||
|
||||
|
||||
# 3. 验证域名
|
||||
print("\n2.3 验证域名...")
|
||||
verified = manager.verify_domain(tenant_id, domain.id)
|
||||
print(f"✅ 域名验证结果: {verified}")
|
||||
|
||||
|
||||
# 4. 通过域名获取租户
|
||||
print("\n2.4 通过域名获取租户...")
|
||||
by_domain = manager.get_tenant_by_domain("test.example.com")
|
||||
@@ -112,14 +110,14 @@ def test_domain_management(tenant_id: str):
|
||||
print(f"✅ 通过域名获取租户成功: {by_domain.name}")
|
||||
else:
|
||||
print("⚠️ 通过域名获取租户失败(验证可能未通过)")
|
||||
|
||||
|
||||
# 5. 列出域名
|
||||
print("\n2.5 列出所有域名...")
|
||||
domains = manager.list_domains(tenant_id)
|
||||
print(f"✅ 找到 {len(domains)} 个域名")
|
||||
for d in domains:
|
||||
print(f" - {d.domain} ({d.status})")
|
||||
|
||||
|
||||
return domain.id
|
||||
|
||||
|
||||
@@ -128,9 +126,9 @@ def test_branding_management(tenant_id: str):
|
||||
print("\n" + "=" * 60)
|
||||
print("测试 3: 品牌白标")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 1. 更新品牌配置
|
||||
print("\n3.1 更新品牌配置...")
|
||||
branding = manager.update_branding(
|
||||
@@ -147,19 +145,19 @@ def test_branding_management(tenant_id: str):
|
||||
print(f" - Logo: {branding.logo_url}")
|
||||
print(f" - 主色: {branding.primary_color}")
|
||||
print(f" - 次色: {branding.secondary_color}")
|
||||
|
||||
|
||||
# 2. 获取品牌配置
|
||||
print("\n3.2 获取品牌配置...")
|
||||
fetched = manager.get_branding(tenant_id)
|
||||
assert fetched is not None, "获取品牌配置失败"
|
||||
print(f"✅ 获取品牌配置成功")
|
||||
|
||||
|
||||
# 3. 生成品牌 CSS
|
||||
print("\n3.3 生成品牌 CSS...")
|
||||
css = manager.get_branding_css(tenant_id)
|
||||
print(f"✅ 生成 CSS 成功 ({len(css)} 字符)")
|
||||
print(f" CSS 预览:\n{css[:200]}...")
|
||||
|
||||
|
||||
return branding.id
|
||||
|
||||
|
||||
@@ -168,9 +166,9 @@ def test_member_management(tenant_id: str):
|
||||
print("\n" + "=" * 60)
|
||||
print("测试 4: 成员管理")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 1. 邀请成员
|
||||
print("\n4.1 邀请成员...")
|
||||
member1 = manager.invite_member(
|
||||
@@ -183,7 +181,7 @@ def test_member_management(tenant_id: str):
|
||||
print(f" - ID: {member1.id}")
|
||||
print(f" - 角色: {member1.role}")
|
||||
print(f" - 权限: {member1.permissions}")
|
||||
|
||||
|
||||
member2 = manager.invite_member(
|
||||
tenant_id=tenant_id,
|
||||
email="member@test.com",
|
||||
@@ -191,36 +189,36 @@ def test_member_management(tenant_id: str):
|
||||
invited_by="user_001"
|
||||
)
|
||||
print(f"✅ 成员邀请成功: {member2.email}")
|
||||
|
||||
|
||||
# 2. 接受邀请
|
||||
print("\n4.2 接受邀请...")
|
||||
accepted = manager.accept_invitation(member1.id, "user_002")
|
||||
print(f"✅ 邀请接受结果: {accepted}")
|
||||
|
||||
|
||||
# 3. 列出成员
|
||||
print("\n4.3 列出所有成员...")
|
||||
members = manager.list_members(tenant_id)
|
||||
print(f"✅ 找到 {len(members)} 个成员")
|
||||
for m in members:
|
||||
print(f" - {m.email} ({m.role}) - {m.status}")
|
||||
|
||||
|
||||
# 4. 检查权限
|
||||
print("\n4.4 检查权限...")
|
||||
can_manage = manager.check_permission(tenant_id, "user_002", "project", "create")
|
||||
print(f"✅ user_002 可以创建项目: {can_manage}")
|
||||
|
||||
|
||||
# 5. 更新成员角色
|
||||
print("\n4.5 更新成员角色...")
|
||||
updated = manager.update_member_role(tenant_id, member2.id, "viewer")
|
||||
print(f"✅ 角色更新结果: {updated}")
|
||||
|
||||
|
||||
# 6. 获取用户所属租户
|
||||
print("\n4.6 获取用户所属租户...")
|
||||
user_tenants = manager.get_user_tenants("user_002")
|
||||
print(f"✅ user_002 属于 {len(user_tenants)} 个租户")
|
||||
for t in user_tenants:
|
||||
print(f" - {t['name']} ({t['member_role']})")
|
||||
|
||||
|
||||
return member1.id, member2.id
|
||||
|
||||
|
||||
@@ -229,9 +227,9 @@ def test_usage_tracking(tenant_id: str):
|
||||
print("\n" + "=" * 60)
|
||||
print("测试 5: 资源使用统计")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 1. 记录使用
|
||||
print("\n5.1 记录资源使用...")
|
||||
manager.record_usage(
|
||||
@@ -244,7 +242,7 @@ def test_usage_tracking(tenant_id: str):
|
||||
members_count=3
|
||||
)
|
||||
print("✅ 资源使用记录成功")
|
||||
|
||||
|
||||
# 2. 获取使用统计
|
||||
print("\n5.2 获取使用统计...")
|
||||
stats = manager.get_usage_stats(tenant_id)
|
||||
@@ -256,13 +254,13 @@ def test_usage_tracking(tenant_id: str):
|
||||
print(f" - 实体数: {stats['entities_count']}")
|
||||
print(f" - 成员数: {stats['members_count']}")
|
||||
print(f" - 使用百分比: {stats['usage_percentages']}")
|
||||
|
||||
|
||||
# 3. 检查资源限制
|
||||
print("\n5.3 检查资源限制...")
|
||||
for resource in ["storage", "transcription", "api_calls", "projects", "entities", "members"]:
|
||||
allowed, current, limit = manager.check_resource_limit(tenant_id, resource)
|
||||
print(f" - {resource}: {current}/{limit} ({'✅' if allowed else '❌'})")
|
||||
|
||||
|
||||
return stats
|
||||
|
||||
|
||||
@@ -271,20 +269,20 @@ def cleanup(tenant_id: str, domain_id: str, member_ids: list):
|
||||
print("\n" + "=" * 60)
|
||||
print("清理测试数据")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
manager = get_tenant_manager()
|
||||
|
||||
|
||||
# 移除成员
|
||||
for member_id in member_ids:
|
||||
if member_id:
|
||||
manager.remove_member(tenant_id, member_id)
|
||||
print(f"✅ 成员已移除: {member_id}")
|
||||
|
||||
|
||||
# 移除域名
|
||||
if domain_id:
|
||||
manager.remove_domain(tenant_id, domain_id)
|
||||
print(f"✅ 域名已移除: {domain_id}")
|
||||
|
||||
|
||||
# 删除租户
|
||||
manager.delete_tenant(tenant_id)
|
||||
print(f"✅ 租户已删除: {tenant_id}")
|
||||
@@ -295,11 +293,11 @@ def main():
|
||||
print("\n" + "=" * 60)
|
||||
print("InsightFlow Phase 8 Task 1 - 多租户 SaaS 架构测试")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
tenant_id = None
|
||||
domain_id = None
|
||||
member_ids = []
|
||||
|
||||
|
||||
try:
|
||||
# 运行所有测试
|
||||
tenant_id = test_tenant_management()
|
||||
@@ -308,16 +306,16 @@ def main():
|
||||
m1, m2 = test_member_management(tenant_id)
|
||||
member_ids = [m1, m2]
|
||||
test_usage_tracking(tenant_id)
|
||||
|
||||
|
||||
print("\n" + "=" * 60)
|
||||
print("✅ 所有测试通过!")
|
||||
print("=" * 60)
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f"\n❌ 测试失败: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
finally:
|
||||
# 清理
|
||||
if tenant_id:
|
||||
@@ -328,4 +326,4 @@ def main():
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user