certora-cli-alpha-master 20250619.9.22.643691__py3-none-macosx_10_9_universal2.whl → 20250619.14.5.808490__py3-none-macosx_10_9_universal2.whl

certora_cli/CertoraProver/certoraCollectConfigurationLayout.py

@@ -25,12 +25,13 @@ sys.path.insert(0, str(scripts_dir_path))
 import CertoraProver.certoraContextAttributes as Attrs
 from CertoraProver.certoraCollectRunMetadata import RunMetaData, MetadataEncoder
 import Shared.certoraUtils as Utils
+from typing import List
 
 
 class MainSection(Enum):
     GENERAL = "GENERAL"
+    OPTIONS = "OPTIONS"
     SOLIDITY_COMPILER = "SOLIDITY_COMPILER"
-    GIT = "GIT"
     NEW_SECTION = "NEW_SECTION"
 
 
@@ -47,13 +48,11 @@ class InnerContent:
     content: Any
     doc_link: str = ''
     tooltip: str = ''
-    unsound: str = 'false'
+    unsound: bool = False
 
     def __post_init__(self) -> None:
         if isinstance(self.content, bool):
             self.content = 'true' if self.content else 'false'
-        if isinstance(self.unsound, bool):
-            self.unsound = 'true' if self.unsound else 'false'
 
 
 @dataclasses.dataclass
@@ -65,6 +64,7 @@ class CardContent:
 
 DOC_LINK_PREFIX = 'https://docs.certora.com/en/latest/docs/'
 GIT_ATTRIBUTES = ['origin', 'revision', 'branch', 'dirty']
+ARG_LIST_ATTRIBUTES = ['prover_args', 'java_args']
 
 
 class AttributeJobConfigData:
@@ -73,13 +73,13 @@ class AttributeJobConfigData:
     This should be added to the AttributeDefinition and configured for every new attribute
     presented in the Rule report.
 
-    Note: Attributes which do not contain specific information will be assigned as a Flag in the General main section!
+    Note: Attributes that do not contain specific information will be presented in the OPTIONS main section!
 
     arguments:
     - main_section : MainSection -- the main section inside the config tab
-        default: MainSection.GENERAL
-    - subsection : str -- the subsection within the main_section (e.g Flags)
-        default: Flags
+        default: MainSection.OPTIONS
+    - subsection : str -- the subsection within the main_section
+        default: None - they will be presented inside the OPTIONS card
     - doc_link : Optional[str] -- a link to the Documentation page of this attribute (if exists)
         default: 'https://docs.certora.com/en/latest/docs/' + Solana/EVM path + #<attribute_name>
     - tooltip : Optional[str] -- a description of this attribute to present in the config tab
@@ -88,7 +88,7 @@ class AttributeJobConfigData:
         default: False
     """
 
-    def __init__(self, main_section: MainSection = MainSection.GENERAL, subsection: str = '',
+    def __init__(self, main_section: MainSection = MainSection.OPTIONS, subsection: str = '',
                  doc_link: Optional[str] = '', tooltip: Optional[str] = '', unsound: bool = False):
         self.main_section = main_section
         self.subsection = subsection
@@ -201,6 +201,40 @@ def create_or_get_card_content(output: list[CardContent], name: str) -> CardCont
     return main_section
 
 
+def split_and_sort_arg_list_value(args_list: List[str]) -> List[str]:
+    """
+    Splits a unified CLI argument list of strings into a sorted list of flag+value groups.
+    This is useful mainly for --prover_args and --java_args.
+
+    For example:
+    "-depth 15 -adaptiveSolverConfig false" → ["-adaptiveSolverConfig false", "-depth 15"]
+
+    Assumes each flag starts with '-' and its value follows immediately, if exists.
+    Lines are sorted alphabetically.
+    """
+    unified_args = ''.join(args_list)
+
+    if not unified_args.strip():
+        return []
+
+    lines: List[str] = []
+    tokens = unified_args.split()
+    curr_line = ""
+
+    for token in tokens:
+        if token.startswith('-'):
+            if curr_line:
+                lines.append(curr_line)
+            curr_line = token
+        else:
+            curr_line += f" {token}"
+
+    if curr_line:
+        lines.append(curr_line)
+
+    return sorted(lines)
+
+
 def create_inner_content(name: str, content_type: ContentType, value: Any, doc_link: str,
                          config_data: AttributeJobConfigData) -> InnerContent:
     return InnerContent(
@@ -209,7 +243,7 @@ def create_inner_content(name: str, content_type: ContentType, value: Any, doc_l
         content=value,
         doc_link=doc_link,
         tooltip=config_data.tooltip or '',
-        unsound='true' if config_data.unsound else 'false'
+        unsound=config_data.unsound
     )
 
 
@@ -260,35 +294,23 @@ def collect_attribute_configs(metadata: dict) -> list[CardContent]:
             )
             continue
 
-        # Find or create the subsection (if it exists)
+        # Find or create the subsection (if it doesn't exist)
         if isinstance(attr_value, list):
-            current_section: Any = main_section
             content_type = ContentType.SIMPLE
+            if attr_name in ARG_LIST_ATTRIBUTES:
+                attr_value = split_and_sort_arg_list_value(attr_value)
 
         elif isinstance(attr_value, dict):
-            current_section = main_section
             content_type = ContentType.COMPLEX
             attr_value = [
                 create_inner_content(key, ContentType.FLAG, value, doc_link, config_data)
                 for key, value in attr_value.items()
             ]
         else:
-            # this attribute is a value attribute without a subsection, it will be placed in flags.
-            subsection_key = config_data.subsection.lower() if config_data.subsection else 'flags'
-            current_section = next((section for section in main_section.content
-                                    if section.inner_title == subsection_key), None)
-            if current_section is None:
-                current_section = InnerContent(
-                    inner_title=subsection_key,
-                    content_type=ContentType.COMPLEX.value,
-                    content=[]
-                )
-                main_section.content.append(current_section)
-
             content_type = ContentType.FLAG
 
         # Update the current section with attribute details
-        current_section.content.append(
+        main_section.content.append(
             create_inner_content(attr_name, content_type, attr_value, doc_link, config_data)
         )
 
@@ -300,37 +322,23 @@ def collect_run_config_from_metadata(attributes_configs: list[CardContent], meta
     Adding CLI and Git configuration from metadata
     """
 
-    # Define a mapping of metadata attributes to their keys in general_section
-    metadata_mappings = {
-        'CLI Version': metadata.get('CLI_version'),
-        'Verify': metadata.get('conf', {}).get('verify'),
-    }
-
     general_section = create_or_get_card_content(attributes_configs, MainSection.GENERAL.value.lower())
 
-    # Add metadata attributes dynamically if they exist
-    for key, value in metadata_mappings.items():
-        if value:
-            general_section.content.append(InnerContent(
-                inner_title=key,
-                content_type=ContentType.FLAG.value,
-                content=value,
-            ))
+    if cli_version := metadata.get('CLI_version'):
+        general_section.content.append(InnerContent(
+            inner_title='CLI Version',
+            content_type=ContentType.FLAG.value,
+            content=cli_version,
+        ))
 
-    # Adding GIT configuration from metadata only if attributes are found
-    git_content = []
     for attr in GIT_ATTRIBUTES:
         if attr_value := metadata.get(attr):
-            git_content.append(InnerContent(
+            general_section.content.append(InnerContent(
                 inner_title=attr,
                 content_type=ContentType.FLAG.value,
                 content=attr_value,
             ))
 
-    if git_content:
-        git_section = create_or_get_card_content(attributes_configs, MainSection.GIT.value.lower())
-        git_section.content = git_content
-
     return attributes_configs
 
 
@@ -338,14 +346,17 @@ def sort_configuration_layout(data: list[CardContent]) -> list[CardContent]:
     """
     Sorts a configuration layout:
     - Top-level sorted by 'card_title'
-    - Nested content sorted by 'inner_title', with 'Verify' first
+    - Nested content sorted by 'inner_title', with 'verify' first
     """
     priority = {
-        "Verify": 0,
+        # Priorities for top-level cards
         "general": 0,
+        "files": 1,
+        "options": 2,
+        # Top level items inside their respective cards
+        "verify": 0,
         "solc": 0,
-        "CLI Version": 1,
-        "flags": 2
+        "CLI Version": 0
     }
 
     def inner_sort_key(item: Any) -> Any:

certora_cli/CertoraProver/certoraContextAttributes.py

@@ -740,8 +740,7 @@ class EvmAttributes(AttrUtil.Attributes):
             'action': AttrUtil.UniqueStore
         },
         affects_build_cache_key=False,
-        disables_build_cache=False,
-        config_data=None
+        disables_build_cache=False
     )
 
     BUILD_CACHE = AttrUtil.AttributeDefinition(

certora_cli/Shared/certoraValidateFuncs.py

@@ -686,7 +686,7 @@ def validate_solc_via_ir_map(args: Dict[str, bool]) -> None:
         if first:
             validation_logger.warning("all via_ir values are set to True '--solc_via_ir' can be used instead")
         else:
-            validation_logger.warning("all via_ir values are set to False, this flag/attribute  can be omitted")
+            validation_logger.warning("all via_ir values are set to False, this flag/attribute can be omitted")
 
 def validate_solc_evm_version_map(args: Dict[str, str]) -> None:
     if not isinstance(args, dict):

{certora_cli_alpha_master-20250619.9.22.643691.dist-info → certora_cli_alpha_master-20250619.14.5.808490.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-alpha-master
-Version: 20250619.9.22.643691
+Version: 20250619.14.5.808490
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 16ddcce.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit d0b812b.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20250619.9.22.643691.dist-info → certora_cli_alpha_master-20250619.14.5.808490.dist-info}/RECORD

@@ -15,12 +15,12 @@ certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=I60x0ykMFPzciD193cP
 certora_cli/CertoraProver/certoraBuildDataClasses.py,sha256=8tPny9-pasC7CCRKQclaVQ3qcEDNa6EdOUu1ZWh0MZY,14704
 certora_cli/CertoraProver/certoraBuildRust.py,sha256=ofKvmtqzUGTrgVm5crcybV7gbElbjiUc6Z4FphPEjz0,6016
 certora_cli/CertoraProver/certoraCloudIO.py,sha256=w3mqA5ANgIX6dsb6Nxg4jl9zBRdAX5kw9xLeYmA-iHc,53062
-certora_cli/CertoraProver/certoraCollectConfigurationLayout.py,sha256=waMo5_nzirDaK7aoPCfoS7jOqqi_6huRc-_jTrDcZO8,14252
+certora_cli/CertoraProver/certoraCollectConfigurationLayout.py,sha256=6aHEGrhT_Y9aYfM5n_Mk--awgcQfdtc-chBPRl7FU4E,14095
 certora_cli/CertoraProver/certoraCollectRunMetadata.py,sha256=n67E7hjVdPlBXMh1FMzcWSgu3v5SfFM_HOO2JpbCeY0,11787
 certora_cli/CertoraProver/certoraCompilerParameters.py,sha256=r35y03IRwWIoz1GCNC7PuW3n8JPz9J1NGwhwUYKdYtI,1452
 certora_cli/CertoraProver/certoraConfigIO.py,sha256=uq-uNnjVBzg9Kh41fDqn-lnwSJXe4k2_iy5GTnQIDa8,7560
 certora_cli/CertoraProver/certoraContext.py,sha256=A4RZMEd7Slx8dt_zEyohfA22wnwE8uw1cyc5ln3BE4k,25716
-certora_cli/CertoraProver/certoraContextAttributes.py,sha256=tc5ieED4H1TaCG4FfEJmdx9b7NDyJzC3qlGfUbIFetg,69106
+certora_cli/CertoraProver/certoraContextAttributes.py,sha256=zg_AmotgzlklxIkj6h7G5mPvRWuMHEYw04eEKsO2u64,69080
 certora_cli/CertoraProver/certoraContextClass.py,sha256=d7HDqM72K7YnswR7kEcAHGwkFNrTqRz5-_0m7cl2Mso,900
 certora_cli/CertoraProver/certoraContextValidator.py,sha256=A7blCXdJTnxTh5x1w1fADinWtRUPJoAZC3bfPj3W3Hs,45333
 certora_cli/CertoraProver/certoraContractFuncs.py,sha256=ipSwge5QQzp8qhUavY44bZ-eCR6szK_HWwSIWqQyuR0,6921
@@ -62,15 +62,15 @@ certora_cli/Shared/__init__.py,sha256=s0dhvolFtsS4sRNzPVhC_rlw8mm194rCZ0WhOxInY4
 certora_cli/Shared/certoraAttrUtil.py,sha256=ZsoS6xbSZnAjEoPEcfiJi6CvHU-1ySBKubvVKh78ohs,8373
 certora_cli/Shared/certoraLogging.py,sha256=cV2UQMhQ5j8crGXgeq9CEamI-Lk4HgdiA3HCrP-kSR4,14013
 certora_cli/Shared/certoraUtils.py,sha256=xTVCh7bWdMDQR37SA6jLUHSelxsk3mbSYi26XKb4MZQ,56006
-certora_cli/Shared/certoraValidateFuncs.py,sha256=EGoCGTtGMRzWdN-T5GducwkYbyqZBcSjQZHpau0fWnQ,41922
+certora_cli/Shared/certoraValidateFuncs.py,sha256=Fn6GN_LEwlMjBdTiVO6WzCg8P5F6DhwkvP9Xl-XiQ6o,41921
 certora_cli/Shared/proverCommon.py,sha256=PqkjycZ3TdZr0RNWoPuA_VZ5b7EAAsu9ewymNH6kIm4,11291
 certora_cli/Shared/rustProverCommon.py,sha256=NIZ5ECbhuiMegyRAl07CV3r68MFG2tBNKgUAQoV4uLI,2049
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=J6NAfN13iz8E7kNRExKxbT7cEYuScEo8Uq250V8B7NY,168
-certora_jars/Typechecker.jar,sha256=81d20jExSt4EgLswUZf35JkfhiPva9oCTsAuzDKpftc,17142966
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=zy91-tq2O8gVujWcQQT_AaetMInqpmFdOPEIla6PbAs,168
+certora_jars/Typechecker.jar,sha256=f_N3qu5QQ38hJCq7hM0vU97sqYU0ps5uLQXlbVud4fA,17142966
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/METADATA,sha256=oQqg7Ag66xH9bd_mOTyNT8K5OKKiI5KfWlXmSBT8leQ,1270
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20250619.9.22.643691.dist-info/RECORD,,
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/METADATA,sha256=Tf7o7nk0XiSzM7-tdd1QKR4HR5ebuDcPfGSfrpTw2FQ,1270
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20250619.14.5.808490.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "16ddcce", "timestamp": "20250619.9.22.643691", "version": "20250619.9.22.643691+16ddcce"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "d0b812b", "timestamp": "20250619.14.5.808490", "version": "20250619.14.5.808490+d0b812b"}