Fix group name and id handling

Author: Nurchik

mythx_cli/analysis/report.py

@@ -49,12 +49,11 @@ def analysis_report(
     :param min_severity: Ignore SWC IDs below the designated level
     :param swc_blacklist: A comma-separated list of SWC IDs to ignore
     :param swc_whitelist: A comma-separated list of SWC IDs to include
-    :param table_sort_key: The column to sort the default table output by
     :return:
     """
 
     issues_list: List[
-        Tuple[DetectedIssuesResponse, Optional[AnalysisInputResponse]]
+        Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
     ] = []
     formatter: BaseFormatter = FORMAT_RESOLVER[ctx["fmt"]]
     for uuid in uuids:
@@ -77,7 +76,7 @@ def analysis_report(
         issues_list.append((uuid, resp, inp))
 
     LOGGER.debug(
-        f"{uuid}: Printing report for {len(issues_list)} issue items with sort key \"{ctx['table_sort_key']}\""
+        f"Printing report for {len(issues_list)} issue items with sort key \"{ctx['table_sort_key']}\""
     )
     write_or_print(
         formatter.format_detected_issues(

mythx_cli/analyze/command.py

@@ -7,6 +7,7 @@
 import click
 from mythx_models.response import (
     AnalysisInputResponse,
+    AnalysisSubmissionResponse,
     DetectedIssuesResponse,
     GroupCreationResponse,
 )
@@ -209,7 +210,7 @@ def analyze(
         group_id = resp.identifier
         group_name = resp.name or ""
 
-    if group_id:
+    if group_id or group_name:
         # associate all following analyses to the passed or newly created group
         group_mw = GroupDataMiddleware(group_id=group_id, group_name=group_name)
         ctx["client"].handler.middlewares.append(group_mw)
@@ -297,7 +298,7 @@ def analyze(
         for job in bar:
             # attach execution mode, submit, poll
             job.update({"analysis_mode": mode})
-            resp = ctx["client"].analyze(**job)
+            resp: AnalysisSubmissionResponse = ctx["client"].analyze(**job)
             uuids.append(resp.uuid)
 
     if async_flag:
@@ -308,7 +309,7 @@ def analyze(
         return
 
     issues_list: List[
-        Tuple[DetectedIssuesResponse, Optional[AnalysisInputResponse]]
+        Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
     ] = []
     formatter: BaseFormatter = FORMAT_RESOLVER[ctx["fmt"]]
     for uuid in uuids:

mythx_cli/group/close.py

@@ -25,7 +25,5 @@ def group_close(ctx, identifiers: List[str]) -> None:
         LOGGER.debug(f"Closing group for ID {identifier}")
         resp: GroupCreationResponse = ctx["client"].seal_group(group_id=identifier)
         write_or_print(
-            "Closed group with ID {} and name '{}'".format(
-                resp.group.identifier, resp.group.name
-            )
+            "Closed group with ID {} and name '{}'".format(resp.identifier, resp.name)
         )

mythx_cli/render/command.py

@@ -5,11 +5,7 @@
 import click
 import htmlmin
 import jinja2
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisStatusResponse,
-    DetectedIssuesResponse,
-)
+from mythx_models.response import AnalysisInputResponse, DetectedIssuesResponse
 from pythx import Client
 
 from mythx_cli.render.util import get_analysis_info
@@ -107,7 +103,7 @@ def render(
     template = env.get_template(template_name)
 
     issues_list: List[
-        Tuple[DetectedIssuesResponse, Optional[AnalysisInputResponse]]
+        Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
     ] = []
     if len(target) == 24:
         LOGGER.debug(f"Identified group target {target}")

mythx_cli/render/util.py

@@ -18,7 +18,7 @@ def get_analysis_info(
     min_severity: Optional[str],
     swc_blacklist: Optional[List[str]],
     swc_whitelist: Optional[List[str]],
-) -> Tuple[AnalysisStatusResponse, DetectedIssuesResponse, AnalysisInputResponse]:
+) -> Tuple[str, AnalysisStatusResponse, DetectedIssuesResponse, AnalysisInputResponse]:
     """Fetch information related to the specified analysis job UUID.
 
     Given a UUID, this function will query the MythX API for the

tests/test_analyze_solidity.py

@@ -1,9 +1,7 @@
 import os
 from copy import deepcopy
-from unittest import mock
 
 import pytest
-from black import out
 from click.testing import CliRunner
 from mythx_models.response import (
     AnalysisInputResponse,

tests/test_status.py

@@ -1,5 +1,4 @@
 import json
-from unittest.mock import patch
 
 from click.testing import CliRunner
 from mythx_models.response import AnalysisStatusResponse, GroupStatusResponse