added tests and ran ruff

Author: omerr-cycode

cycode/cli/app.py

@@ -9,7 +9,7 @@
 from typer.completion import install_callback, show_callback
 
 from cycode import __version__
-from cycode.cli.apps import ai_remediation, auth, configure, ignore, report, scan, status,report_import
+from cycode.cli.apps import ai_remediation, auth, configure, ignore, report, scan, status, report_import
 
 if sys.version_info >= (3, 10):
     from cycode.cli.apps import mcp

cycode/cli/apps/report_import/__init__.py

@@ -5,5 +5,4 @@
 
 app = typer.Typer(name='import', no_args_is_help=True)
 app.callback(short_help='Import report. You`ll need to specify which report type to import.')(report_import_command)
-app.command(name='sbom',short_help='Import SBOM report from a local path.')(sbom_command)
-
+app.command(name='sbom', short_help='Import SBOM report from a local path.')(sbom_command)

cycode/cli/apps/report_import/sbom/__init__.py

@@ -3,5 +3,4 @@
 from cycode.cli.apps.report_import.sbom.sbom_command import sbom_command
 
 app = typer.Typer(name='sbom')
-app.command(name='path',short_help='Import SBOM report from a local path.')(sbom_command)
-
+app.command(name='path', short_help='Import SBOM report from a local path.')(sbom_command)

cycode/cli/apps/report_import/sbom/sbom_command.py

@@ -32,10 +32,20 @@ def sbom_command(
         str, typer.Option('--vendor', '-v', help='Vendor Name.', case_sensitive=False, show_default=False)
     ],
     labels: Annotated[
-        Optional[List[str]], typer.Option('--label', '-l', help='Label, can be specified multiple times.', case_sensitive=False, show_default=False)
+        Optional[List[str]],
+        typer.Option(
+            '--label', '-l', help='Label, can be specified multiple times.', case_sensitive=False, show_default=False
+        ),
     ] = [],
     owners: Annotated[
-        Optional[List[str]], typer.Option('--owner', '-o', help='Email address of a user in Cycode platform, can be specified multiple times.', case_sensitive=True, show_default=False)
+        Optional[List[str]],
+        typer.Option(
+            '--owner',
+            '-o',
+            help='Email address of a user in Cycode platform, can be specified multiple times.',
+            case_sensitive=True,
+            show_default=False,
+        ),
     ] = [],
     business_impact: Annotated[
         BusinessImpactOption,
@@ -65,6 +75,7 @@ def sbom_command(
         if not input_file.exists():
             from errno import ENOENT
             from os import strerror
+
             raise FileNotFoundError(ENOENT, strerror(ENOENT), input_file.absolute())
 
         client.request_sbom_import_execution(import_parameters, input_file)

cycode/cyclient/import_sbom_client.py

@@ -25,11 +25,11 @@ def to_request_form(self) -> dict:
         form_data = {}
         for field in dataclasses.fields(self):
             key = field.name
-            val = getattr(self,key)
+            val = getattr(self, key)
             if val is None or len(val) == 0:
                 continue
-            if isinstance(val,list):
-                form_data[f"{key}[]"] = val
+            if isinstance(val, list):
+                form_data[f'{key}[]'] = val
             else:
                 form_data[key] = val
         return form_data
@@ -52,38 +52,29 @@ def request_sbom_import_execution(self, params: ImportSbomParameters, file_path:
         request_args = {
             'url_path': self.IMPORT_SBOM_REQUEST_PATH,
             'data': form_data,
-            'files': {
-                'File': open(file_path.absolute(),'rb')
-            },
+            'files': {'File': open(file_path.absolute(), 'rb')},
         }
 
         response = self.client.post(**request_args)
 
         if response.status_code != 201:
-            raise RequestHttpError(response.status_code, response.text,response)
-        
-    def get_owners_user_ids(self,owners: List[str]) -> List[str]:
-        return [ self._get_user_id_by_email(owner) for owner in owners]    
-    
-    def _get_user_id_by_email(self,email: str) -> str:
-        
-        request_args = {
-            'url_path': self.GET_USER_ID_REQUEST_PATH,
-            'params': {
-                'email': email
-            }
-        }
+            raise RequestHttpError(response.status_code, response.text, response)
+
+    def get_owners_user_ids(self, owners: List[str]) -> List[str]:
+        return [self._get_user_id_by_email(owner) for owner in owners]
+
+    def _get_user_id_by_email(self, email: str) -> str:
+        request_args = {'url_path': self.GET_USER_ID_REQUEST_PATH, 'params': {'email': email}}
 
         response = self.client.get(**request_args)
         member_details = self.parse_requested_member_details_response(response)
 
         if not member_details.items:
-            raise Exception(f"Failed to find user with email '{email}'. Verify this email is registered to Cycode platform")
+            raise Exception(
+                f"Failed to find user with email '{email}'. Verify this email is registered to Cycode platform"
+            )
         return member_details.items.pop(0).external_id
-    
+
     @staticmethod
     def parse_requested_member_details_response(response: Response) -> models.MemberDetails:
         return models.RequestedMemberDetailsResultSchema().load(response.json())
-
-
-

cycode/cyclient/models.py

@@ -47,10 +47,10 @@ class DetectionSchema(Schema):
     class Meta:
         unknown = EXCLUDE
 
-    id = fields.String(missing=None)
+    id = fields.String(load_default=None)
     message = fields.String()
     type = fields.String()
-    severity = fields.String(missing=None)
+    severity = fields.String(load_default=None)
     detection_type_id = fields.String()
     detection_details = fields.Dict()
     detection_rule_id = fields.String()
@@ -401,10 +401,12 @@ class Meta:
     def build_dto(self, data: dict[str, Any], **_) -> SbomReport:
         return SbomReport(**data)
 
+
 @dataclass
 class Member:
     external_id: str
 
+
 class MemberSchema(Schema):
     class Meta:
         unknown = EXCLUDE
@@ -415,12 +417,14 @@ class Meta:
     def build_dto(self, data: dict[str, Any], **_) -> Member:
         return Member(**data)
 
+
 @dataclass
 class MemberDetails:
     items: list[Member]
     page_size: int
     next_page_token: Optional[str]
 
+
 class RequestedMemberDetailsResultSchema(Schema):
     class Meta:
         unknown = EXCLUDE
@@ -430,9 +434,10 @@ class Meta:
     next_page_token = fields.String(allow_none=True)
 
     @post_load
-    def build_dto(self, data: dict[str,Any], **_) -> MemberDetails:
+    def build_dto(self, data: dict[str, Any], **_) -> MemberDetails:
         return MemberDetails(**data)
 
+
 @dataclass
 class ClassificationData:
     severity: str