tensorrt_llm/serve/tool_parser/glm4_parser.py (2)

477-480: Minor: Duplicate logic branches.

Lines 477-478 and 479-480 have identical logic. Consider consolidating:

Suggested simplification

             elif arg_type == "string":
                 if isinstance(parsed_value, str):
                     arguments[arg_key] = parsed_value
                 elif isinstance(parsed_value, (dict, list)):
                     arguments[arg_key] = json.dumps(parsed_value, ensure_ascii=False)
                 else:
                     arguments[arg_key] = str(parsed_value)
-            elif arg_type is None:
-                arguments[arg_key] = parsed_value if is_good_json else arg_value
             else:
+                # Covers arg_type is None and all other types
                 arguments[arg_key] = parsed_value if is_good_json else arg_value

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@tensorrt_llm/serve/tool_parser/glm4_parser.py` around lines 477 - 480, The
two branches with identical bodies can be collapsed: remove the duplicate
elif/else and replace with a single assignment that sets arguments[arg_key] =
parsed_value if is_good_json else arg_value (using the existing
arg_type/arg_key/parsed_value/is_good_json/arg_value variables) so the logic is
not repeated in the function containing this code; ensure any needed handling
for arg_type being None is preserved by performing the assignment once in place
of both branches.

---

162-164: Consider narrowing exception handling.

Per coding guidelines, avoid broad exception handling. While catching all exceptions at parsing boundaries prevents crashes from malformed model output, consider catching more specific exceptions (e.g., re.error, json.JSONDecodeError, KeyError, AttributeError) to avoid masking unexpected bugs.

Suggested narrowing

-        except Exception as e:
+        except (re.error, json.JSONDecodeError, KeyError, AttributeError, IndexError) as e:
             logger.error(f"Error in detect_and_parse: {e}")
             return StreamingParseResult(normal_text=text)

The same applies to lines 440-441 and 455-457.

tensorrt_llm/serve/tool_parser/utils.py (1)

5-5: Consider using built-in generics for Python 3.10+.

Per codebase conventions (Python 3.10+), you can use dict and Optional from builtins instead of importing from typing. However, since Any still requires the typing import, this is a minor nit.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@tensorrt_llm/serve/tool_parser/utils.py` at line 5, The import in utils.py
currently pulls Dict and Optional from typing; update it to use built-in
generics and PEP 604 union syntax: import only Any from typing (e.g., "from
typing import Any"), then change any type annotations that used Dict[...] to use
built-in dict[...] and change Optional[T] to T | None (or T | None with Any
where applicable) so you no longer import Dict/Optional from typing; keep Any
imported from typing as needed.