drun 2.1.2__tar.gz → 2.2.2__tar.gz

{drun-2.1.2 → drun-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.1.2
+Version: 2.2.2
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.1.2 → drun-2.2.2}/drun/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "2.1.2"
+__version__ = "2.2.2"

{drun-2.1.2 → drun-2.2.2}/drun/cli.py

@@ -1677,7 +1677,7 @@ def init_project(
     from drun import scaffolds
     
     # Display version
-    typer.echo(f"Drun v{_get_drun_version()}\n")
+    typer.echo(f"Drun v{_get_drun_version()}")
 
     # 确定目标目录
     if name:
@@ -1752,6 +1752,9 @@ def init_project(
     # testcases/test_stream.yaml
     _write_template("testcases/test_stream.yaml", scaffolds.STREAM_TESTCASE)
 
+    # testcases/test_assertions.yaml
+    _write_template("testcases/test_assertions.yaml", scaffolds.ASSERTIONS_TESTCASE)
+
     # data/users.csv
     _write_template("data/users.csv", scaffolds.CSV_USERS_SAMPLE)
 
@@ -1806,7 +1809,8 @@ def init_project(
         ("│   ├── ", "test_api_health.yaml", "健康检查示例"),
         ("│   ├── ", "test_stream.yaml", "流式响应 (SSE) 示例"),
         ("│   ├── ", "test_db_assert.yaml", "数据库断言示例"),
-        ("│   └── ", "test_import_users.yaml", "CSV 参数化示例"),
+        ("│   ├── ", "test_import_users.yaml", "CSV 参数化示例"),
+        ("│   └── ", "test_assertions.yaml", "断言操作符完整示例"),
         ("├── ", "testsuites/", ""),
         ("│   ├── ", "testsuite_smoke.yaml", "冒烟测试套件"),
         ("│   └── ", "testsuite_csv.yaml", "CSV 示例套件"),
@@ -1841,7 +1845,7 @@ def init_project(
         else:
             typer.echo(full)
     typer.echo("")
-    typer.echo("9 directories, 17 files")
+    typer.echo("9 directories, 18 files")
 
     if skipped_files:
         typer.echo("")
@@ -1862,20 +1866,10 @@ def init_project(
     if name:
         typer.echo(f"  cd {name}")
     typer.echo("  drun run testcases/test_api_health.yaml")
-    # httpstat 功能已删除
-    typer.echo("  drun run testcases/test_stream.yaml      # 流式响应 (SSE) 示例")
-    typer.echo("  drun run testcases/test_db_assert.yaml   # 数据库断言示例")
-    typer.echo("  drun run testcases/test_import_users.yaml  # CSV 数据驱动示例")
-    typer.echo("")
-    typer.echo("格式转换 (查看 converts/README.md 获取详细说明):")
-    typer.echo("  - cURL 转用例:")
-    typer.echo("    drun convert converts/curl/sample.curl --outfile testcases/new_test.yaml")
-    typer.echo("  - Postman 转用例:")
-    typer.echo("    drun convert converts/postman/sample_collection.json --split-output --suite-out testsuites/new_suite.yaml")
-    typer.echo("  - HAR 转用例:")
-    typer.echo("    drun convert converts/har/sample_recording.har --exclude-static --only-2xx --outfile testcases/from_har.yaml")
-    typer.echo("  - OpenAPI 转用例:")
-    typer.echo("    drun convert-openapi converts/openapi/sample_openapi.json --split-output --outfile testcases/from_openapi.yaml")
+    typer.echo("  drun run testcases/test_stream.yaml")
+    typer.echo("  drun run testcases/test_db_assert.yaml")
+    typer.echo("  drun run testcases/test_import_users.yaml")
+    typer.echo("  drun run testcases/test_assertions.yaml")
     typer.echo("")
     typer.echo("文档: https://github.com/Devliang24/drun")
 

{drun-2.1.2 → drun-2.2.2}/drun/reporter/html_reporter.py

@@ -44,14 +44,28 @@ def _escape_html(text: str) -> str:
     )
 
 
+def _format_assert_value(value: Any) -> str:
+    """Format assertion value: strings without quotes, others with JSON"""
+    if value is None:
+        return "null"
+    if isinstance(value, str):
+        return value
+    if isinstance(value, bool):
+        return "true" if value else "false"
+    if isinstance(value, (int, float)):
+        return str(value)
+    # For lists and dicts, use JSON formatting
+    return json.dumps(value, ensure_ascii=False)
+
+
 def _build_assert_table(asserts: List[AssertionResult]) -> str:
     rows = []
     for a in asserts or []:
         cells = [
             f"<td><code>{_escape_html(str(a.check))}</code></td>",
             f"<td><code>{_escape_html(str(a.comparator))}</code></td>",
-            f"<td><code>{_escape_html(json.dumps(a.expect, ensure_ascii=False))}</code></td>",
-            f"<td><code>{_escape_html(json.dumps(a.actual, ensure_ascii=False))}</code></td>",
+            f"<td><code>{_escape_html(_format_assert_value(a.expect))}</code></td>",
+            f"<td><code>{_escape_html(_format_assert_value(a.actual))}</code></td>",
             ("<td><span class='ok'>✓</span></td>" if a.passed else f"<td><span class='err' title='{_escape_html(a.message or '')}'>✗</span></td>")
         ]
         rows.append("<tr " + ("data-pass=1" if a.passed else "data-pass=0") + ">" + "".join(cells) + "</tr>")
@@ -428,14 +442,14 @@ def write_html(report: RunReport, outfile: str | Path) -> None:
   .panel .p-head { padding:6px 8px; background:var(--panel-head-bg); color:var(--muted); font-size:12px; display:flex; justify-content:space-between; align-items:center; }
   .panel .p-head .actions { display:flex; gap:6px; }
   .panel pre, .panel table { margin:0; padding:10px; overflow:auto; max-height: 360px; }
-  .panel[data-section='curl'] pre { white-space: pre-wrap; word-break: break-word; }
+  .panel[data-section='curl'] pre { white-space: pre; overflow-x: auto; word-break: normal; }
   table { width: 100%; border-collapse: collapse; table-layout: fixed; }
   th { padding: 6px 8px; border-bottom: 1px solid var(--border); vertical-align: top; text-align: left; font-weight: 600; }
   td { padding: 6px 8px; border-bottom: 1px solid var(--border); vertical-align: top; word-break: break-word; }
-  .assert-table th:nth-child(1), .assert-table td:nth-child(1) { width: 25%; }
-  .assert-table th:nth-child(2), .assert-table td:nth-child(2) { width: 10%; }
-  .assert-table th:nth-child(3), .assert-table td:nth-child(3) { width: 25%; }
-  .assert-table th:nth-child(4), .assert-table td:nth-child(4) { width: 25%; }
+  .assert-table th:nth-child(1), .assert-table td:nth-child(1) { width: 23%; }
+  .assert-table th:nth-child(2), .assert-table td:nth-child(2) { width: 15%; }
+  .assert-table th:nth-child(3), .assert-table td:nth-child(3) { width: 23%; }
+  .assert-table th:nth-child(4), .assert-table td:nth-child(4) { width: 24%; }
   .assert-table th:nth-child(5), .assert-table td:nth-child(5) { width: 15%; text-align: center; }
   .ok { color: var(--ok); }
   .err { color: var(--fail); }

{drun-2.1.2 → drun-2.2.2}/drun/runner/assertions.py

@@ -23,6 +23,19 @@ def op_ge(a: Any, b: Any) -> bool: return a >= b
 def op_len_eq(a: Any, b: Any) -> bool: return _len(a) == int(b)
 def op_in(a: Any, b: Any) -> bool: return a in b if b is not None else False
 def op_not_in(a: Any, b: Any) -> bool: return a not in b if b is not None else True
+def op_contains_all(a: Any, b: Any) -> bool:
+    """Check if all elements in list a contain string b"""
+    if not isinstance(a, list):
+        return False
+    if not b:
+        return False
+    return all(str(b) in str(item) for item in a)
+def op_match_regex_all(a: Any, b: Any) -> bool:
+    """Check if all elements in list a match regex pattern b"""
+    if not isinstance(a, list):
+        return False
+    pattern = str(b)
+    return all(bool(re.search(pattern, str(item))) for item in a)
 
 
 OPS: Dict[str, Callable[[Any, Any], bool]] = {
@@ -38,6 +51,8 @@ OPS: Dict[str, Callable[[Any, Any], bool]] = {
     "len_eq": op_len_eq,
     "in": op_in,
     "not_in": op_not_in,
+    "contains_all": op_contains_all,
+    "match_regex_all": op_match_regex_all,
 }
 
 

{drun-2.1.2 → drun-2.2.2}/drun/runner/runner.py

@@ -563,9 +563,15 @@ class Runner:
                 step_failed = False
                 for v in step.validators:
                     rendered_check = self._render(v.check, variables, funcs, envmap)
-                    check_str = rendered_check if isinstance(rendered_check, str) else str(v.check)
+                    # If rendered_check is not a string, it's already a value (e.g., extracted variable)
+                    # Use it directly as actual instead of trying to resolve from response
+                    if not isinstance(rendered_check, str):
+                        actual = rendered_check
+                        check_str = str(v.check)
+                    else:
+                        check_str = rendered_check
+                        actual = self._resolve_check(check_str, resp_obj)
                     expect_rendered = self._render(v.expect, variables, funcs, envmap)
-                    actual = self._resolve_check(check_str, resp_obj)
                     passed, err = compare(v.comparator, actual, expect_rendered)
                     msg = err
                     if not passed and msg is None:

{drun-2.1.2 → drun-2.2.2}/drun/scaffolds/__init__.py

@@ -5,6 +5,7 @@ Drun 项目脚手架模板集合。
 """
 
 from .templates import (
+    ASSERTIONS_TESTCASE,
     CONVERTS_README,
     CSV_DATA_TESTCASE,
     CSV_DATA_TESTSUITE,
@@ -27,6 +28,7 @@ from .templates import (
 )
 
 __all__ = [
+    "ASSERTIONS_TESTCASE",
     "CONVERTS_README",
     "CSV_DATA_TESTCASE",
     "CSV_DATA_TESTSUITE",

{drun-2.1.2 → drun-2.2.2}/drun/scaffolds/templates.py

@@ -1775,5 +1775,254 @@ steps:
       - gt: [$time_to_last, $time_to_first] # 末包晚于首包
 """
 
+# 断言完整示例用例模板
+ASSERTIONS_TESTCASE = """config:
+  name: 断言操作符完整示例
+  base_url: ${ENV(BASE_URL)}
+  tags: [demo, assertions]
+  variables:
+    expected_username: test_user
+    max_response_time: 2000
+    min_items: 5
+    search_keyword: embedding
+
+steps:
+  # ==================== 基础比较断言 ====================
+  - name: 基础比较断言示例
+    request:
+      method: GET
+      path: /get?page=1&limit=10
+      headers:
+        User-Agent: Drun-Test-Client
+    extract:
+      page_num: $.args.page
+      limit_num: $.args.limit
+    validate:
+      # eq: 等于
+      - eq: [status_code, 200]
+      - eq: [$page_num, "1"]
+      - eq: [$.args.limit, "10"]
+      
+      # ne: 不等于
+      - ne: [status_code, 404]
+      - ne: [$limit_num, "20"]
+      
+      # lt: 小于
+      - lt: [$elapsed_ms, $max_response_time]
+      - lt: [$page_num, "10"]
+      
+      # le: 小于等于
+      - le: [status_code, 299]
+      - le: [$limit_num, "10"]
+      
+      # gt: 大于
+      - gt: [status_code, 100]
+      - gt: [$elapsed_ms, 0]
+      
+      # ge: 大于等于
+      - ge: [status_code, 200]
+      - ge: [$limit_num, "1"]
+
+  # ==================== 字符串断言 ====================
+  - name: 字符串断言示例
+    request:
+      method: POST
+      path: /anything
+      headers:
+        Content-Type: application/json
+        User-Agent: Drun-Test-Client/v1.0
+      body:
+        username: $expected_username
+        email: test@example.com
+        description: This is a test user account
+    extract:
+      response_json: $.json
+      user_agent: $.headers.User-Agent
+    validate:
+      # contains: 包含子字符串
+      - contains: [headers.Content-Type, application/json]
+      - contains: [$user_agent, Drun-Test-Client]
+      - contains: [$.json.description, test user]
+      
+      # not_contains: 不包含子字符串
+      - not_contains: [$.json.username, admin]
+      - not_contains: [$.json.email, .cn]
+      
+      # regex: 正则表达式匹配
+      - regex: [$.json.email, '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$']
+      - regex: [$.json.username, '^[a-z_]+$']
+      - regex: [$user_agent, 'Drun.*v\d+\.\d+']
+
+  # ==================== 集合与长度断言 ====================
+  - name: 集合与长度断言示例
+    request:
+      method: POST
+      path: /anything
+      body:
+        tags: [python, testing, automation, api]
+        permissions: [read, write, delete]
+        metadata:
+          count: 42
+          active: true
+    extract:
+      tags_list: $.json.tags
+      permissions: $.json.permissions
+      tag_count: $.json.tags
+      first_permission: $.json.permissions[0]
+    validate:
+      # in: 值在列表中
+      - in: [python, $tags_list]
+      - in: [testing, $tags_list]
+      - in:
+          - $first_permission
+          - [read, write, admin]
+      
+      # not_in: 值不在列表中
+      - not_in: [java, $tags_list]
+      - not_in: [admin, $permissions]
+      
+      # len_eq: 长度等于
+      - len_eq: [$tags_list, 4]
+      - len_eq: [$permissions, 3]
+      - len_eq: [$.json.metadata, 2]
+
+  # ==================== 批量断言（列表）====================
+  - name: 批量断言示例 - 模型列表
+    # 注意：实际使用时应该用 JSONPath 从响应中提取列表
+    # 例如：extract: { all_model_names: "$.data.items[*].model_name" }
+    # 这里为了演示，使用预定义的变量
+    variables:
+      all_model_names:
+        - Deepexi-Embedding-V1
+        - Deepexi-Embedding-V2
+        - Deepexi-Embedding-V3
+      all_model_ids:
+        - emb-001
+        - emb-002
+        - emb-003
+    request:
+      method: GET
+      path: /anything/models
+      params:
+        category: embedding
+        vendor: deepexi
+    validate:
+      - eq: [status_code, 200]
+      
+      # contains_all: 列表中所有元素都包含指定字符串
+      - contains_all: [$all_model_names, Deepexi]
+      - contains_all: [$all_model_names, Embedding]
+      - contains_all: [$all_model_ids, emb-]
+      
+      # match_regex_all: 列表中所有元素都匹配正则表达式
+      - match_regex_all: [$all_model_names, '^Deepexi-Embedding-V\d+$']
+      - match_regex_all: [$all_model_ids, '^emb-\d{3}$']
+
+  # ==================== 复杂场景组合 ====================
+  - name: 复杂场景组合示例
+    request:
+      method: GET
+      path: /get
+      params:
+        search: $search_keyword
+        page: 1
+        page_size: 20
+      headers:
+        Accept: application/json
+        X-Request-ID: ${short_uid(16)}
+    extract:
+      items_list: $.args
+      request_id: $.headers.X-Request-ID
+    validate:
+      # 状态码检查
+      - eq: [status_code, 200]
+      - ge: [status_code, 200]
+      - lt: [status_code, 300]
+      
+      # 响应时间检查
+      - lt: [$elapsed_ms, 3000]
+      - gt: [$elapsed_ms, 0]
+      
+      # Content-Type 检查
+      - contains: [headers.Content-Type, application/json]
+      - not_contains: [headers.Content-Type, text/html]
+      
+      # 参数回显检查
+      - eq: [$.args.search, $search_keyword]
+      - regex: [$.args.page, '^\d+$']
+      - regex: [$.args.page_size, '^\d+$']
+      
+      # Request ID 格式检查
+      - regex: [$request_id, '^[a-f0-9]{16}$']
+      - len_eq: [$request_id, 16]
+
+  # ==================== JSONPath 提取 + 批量断言 ====================
+  - name: JSONPath 提取 + 批量断言
+    # 注意：实际使用时应该用 JSONPath 从响应中提取列表
+    # 例如：extract: { all_usernames: "$.json.users[*].username" }
+    # 这里为了演示，使用预定义的变量模拟提取的数据
+    variables:
+      # 模拟从响应中提取的用户名列表
+      all_usernames:
+        - alice
+        - bob
+        - carol
+      # 模拟从响应中提取的邮箱列表
+      all_emails:
+        - alice@example.com
+        - bob@example.com
+        - carol@example.com
+    request:
+      method: POST
+      path: /anything/api/users
+      body:
+        users:
+          - username: alice
+            email: alice@example.com
+            role: admin
+          - username: bob
+            email: bob@example.com
+            role: member
+          - username: carol
+            email: carol@example.com
+            role: member
+    validate:
+      - eq: [status_code, 200]
+      
+      # 验证所有用户名都是小写字母
+      - match_regex_all: [$all_usernames, '^[a-z]+$']
+      
+      # 验证所有邮箱格式正确
+      - match_regex_all: [$all_emails, '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$']
+      
+      # 验证所有邮箱都来自 example.com 域
+      - contains_all: [$all_emails, example.com]
+      
+      # 验证列表长度
+      - len_eq: [$all_usernames, 3]
+      - len_eq: [$all_emails, 3]
+
+  # ==================== 性能和负值断言 ====================
+  - name: 性能和边界值断言
+    request:
+      method: GET
+      path: /delay/0
+    extract:
+      response_time: $elapsed_ms
+    validate:
+      - eq: [status_code, 200]
+      
+      # 性能断言
+      - lt: [$response_time, 1000]    # 响应时间 < 1秒
+      - gt: [$response_time, 0]       # 响应时间 > 0
+      - le: [$response_time, 1000]    # 响应时间 <= 1秒
+      - ge: [$response_time, 0]       # 响应时间 >= 0
+      
+      # 状态码范围
+      - ge: [status_code, 200]
+      - lt: [status_code, 300]
+      - ne: [status_code, 204]
+"""
+
 # .gitkeep 文件内容（用于保留空目录）
 GITKEEP_CONTENT = "# This file keeps the directory in version control\n"

{drun-2.1.2 → drun-2.2.2}/drun/utils/curl.py

@@ -5,12 +5,18 @@ from typing import Any, Dict
 
 
 def to_curl(method: str, path: str, *, headers: Dict[str, str] | None = None, data: Any | None = None) -> str:
-    """Build a curl command string.
+    """Build a curl command string with multi-line formatting.
 
     - Uses --data-raw for request body to keep payload untouched.
     - Pretty prints JSON body with indent=2 when data is dict/list for readability.
+    - Formats output with each parameter on a separate line using backslash continuation.
     """
-    parts = ["curl", "-X", method.upper(), shlex.quote(path)]
+    lines = ["curl \\"]
+    
+    # Method and URL
+    lines.append(f"  -X {method.upper()} \\")
+    lines.append(f"  {shlex.quote(path)} \\")
+    
     # Prepare headers (case-insensitive handling)
     hdrs: Dict[str, str] = dict(headers or {})
     has_ct = any(k.lower() == "content-type" for k in hdrs.keys())
@@ -21,14 +27,22 @@ def to_curl(method: str, path: str, *, headers: Dict[str, str] | None = None, da
             is_json_like = s.startswith("{") or s.startswith("[")
         if is_json_like:
             hdrs["Content-Type"] = "application/json"
+    
+    # Headers (each on separate line)
     for k, v in hdrs.items():
-        parts += ["-H", shlex.quote(f"{k}: {v}")]
+        lines.append(f"  -H {shlex.quote(f'{k}: {v}')} \\")
+    
+    # Data (if exists)
     if data is not None:
         if isinstance(data, (dict, list)):
             import json
             payload = json.dumps(data, ensure_ascii=False, indent=2)
         else:
             payload = str(data)
-        # Prefer --data-raw to avoid implicit transformations
-        parts += ["--data-raw", shlex.quote(payload)]
-    return " ".join(parts)
+        # Last line without backslash
+        lines.append(f"  --data-raw {shlex.quote(payload)}")
+    else:
+        # Remove trailing backslash from last line
+        lines[-1] = lines[-1].rstrip(' \\')
+    
+    return '\n'.join(lines)

{drun-2.1.2 → drun-2.2.2}/drun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.1.2
+Version: 2.2.2
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.1.2 → drun-2.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "drun"
-version = "2.1.2"
+version = "2.2.2"
 description = "Minimal HTTP API test runner (MVP)"
 requires-python = ">=3.10"
 authors = [{ name = "Drun Team" }]