feat: Attachment() and base class SW360Resource

sw360/__init__.py

@@ -12,5 +12,6 @@
 from .sw360_api import SW360  # noqa: F401
 from .sw360error import SW360Error  # noqa: F401
 from .sw360oauth2 import SW360OAuth2  # noqa: F401
-from .sw360_objects import Component, Release
-__all__ = ["SW360", "SW360Error", "SW360OAuth2", "Component", "Release"]
+from .sw360_objects import Component, Release, Attachment
+
+__all__ = ["SW360", "SW360Error", "SW360OAuth2", "Component", "Release", "Attachment"]

sw360/sw360_objects.py

@@ -7,13 +7,40 @@
 # SPDX-License-Identifier: MIT
 # -------------------------------------------------------------------------------
 
-"""High-Level Python interface to the SW360 REST API. This is a set of Python
-classes abstracting most important aspects of the SW360 REST API. For now, this
-does NOT strive to provide a complete API abstraction, just provide a more
-convenient abstraction for some (important) objects."""
+"""Preview of High-Level, object oriented Python interface to the SW360 REST API.
+For now, this does NOT strive to be stable or complete. Feel free to use it as
+a more convenient abstraction for some (important) objects, but be prepared for
+changes."""
 
 
-class Release:
+class SW360Resource:
+    """Base class representing an SW360 resource like project, component,
+    release etc.
+    """
+
+    def __init__(self, json=None, resource_id=None, **kwargs):
+        self.details = {}
+        """All resource details which are not explicitely supported by the
+        constructor parameters of the derived objexts are stored in the
+        `details` attribute. Shall use names and types as specified in SW360
+        REST API."""
+
+        self.id = resource_id
+        """All SW360 resource instances have an `id`. If it is set to `None`,
+        the object is yet unknown to SW360 - otherwise, it stores the SW360
+        id (release_id, component_id, etc.)."""
+
+        for key, value in kwargs:
+            self.details[key] = value
+
+        if json is not None:
+            self.from_json(json)
+
+    def from_json(self, json):
+        pass
+
+
+class Release(SW360Resource):
     """A release is the SW360 abstraction for a single version of a component.
 
     You can either create it from a SW360 `json` object or by specifying the
@@ -27,29 +54,23 @@ class Release:
     :param component_id: SW360 id of the component the release belongs to
     :param version: the actual version
     :param downloadurl: URL the release was downloaded from
+    :param release_id: id of the release (if exists in SW360 already)
     :param kwargs: additional relase details as specified in the SW360 REST API
     :type json: SW360 JSON object
     :type component_id: string
     :type version: string
     :type downloadurl: string
+    :type release_id: string
     :type kwargs: dictionary
-
     """
-    def __init__(self, json=None, component_id=None, version=None,
-                 downloadurl=None, **kwargs):
-        self.details = {}
-        """All release details which are not explicitely supported by the
-        constructor parameters are stored in the `details` attribute. Shall use
-        names and types as specified in SW360 REST API."""
+    def __init__(self, json=None, release_id=None, component_id=None,
+                 version=None, downloadurl=None, **kwargs):
+        self.attachments = {}
 
-        if json is not None:
-            self.from_json(json)
-        else:
-            self.component_id = component_id
-            self.version = version
-            self.downloadurl = downloadurl
-            for key, value in kwargs:
-                self.details[key] = value
+        self.component_id = component_id
+        self.version = version
+        self.downloadurl = downloadurl
+        super().__init__(json, release_id, **kwargs)
 
     def from_json(self, json):
         """Parse release JSON object from SW360 REST API. The component it
@@ -58,17 +79,19 @@ def from_json(self, json):
 
         All details not directly supported by this class will be stored as-is
         in the `details` instance attribute. For now, this also includes
-        attachment information and external ids which will be stored as-is in
-        `details['_embedded']['sw360:attachments']` and
-        `details['externalIds'].  Please note that this might change in future
-        if better abstractions will be added in this Python library."""
+        external ids which will be stored as-is in `details['externalIds'].
+        Please note that this might change in future if better abstractions
+        will be added in this Python library."""
+        attachments = []
         for key, value in json.items():
             if key in ("name", "version", "downloadurl"):
                 self.__setattr__(key, value)
-            elif key == "_links":
+            elif key in ("_links", "_embedded"):
                 for links_key, links_value in value.items():
                     if links_key == "sw360:component":
                         self.component_id = links_value["href"].split("/")[-1]
+                    elif links_key == "sw360:attachments":
+                        attachments = links_value
                     elif links_key == "self":
                         self.id = links_value["href"].split("/")[-1]
                     else:
@@ -77,12 +100,85 @@ def from_json(self, json):
             else:
                 self.details[key] = value
 
+        for attachment_json in attachments:
+            attachment = Attachment(resources=[self])
+            attachment.from_json(attachment_json)
+            self.attachments[attachment.id] = attachment
+
     def __repr__(self):
         """Representation string."""
         return "<Release %s %s id:%s>" % (self.name, self.version, self.id)
 
 
-class Component:
+class Attachment(SW360Resource):
+    """An attachment is used to store all kinds of files in SW360, for example
+    upstream source files (attachment_type "SOURCE"), self-created source file bundles
+    ("SOURCE_SELF"), clearing reports ("CLEARING_REPORT") or CLI files
+    ("COMPONENT_LICENSE_INFO_XML").
+
+    You can either create it from a SW360 `json` object or by specifying the
+    details via the constructor parameters, see list below. Only the most
+    important attributes are supported, rest hast be provided via `kwargs` and
+    is stored in the `details` attribute of instances.
+
+    For JSON parsing, please read documentation of from_json() method.
+
+    :param json: create release from SW360 JSON object by calling from_json()
+    :param attachment_id: SW360 id of the attachment (if it exists already)
+    :param resources: dictionary of SW360 resource objects the attachment belongs to
+                      (instances of Release(), Component() or Project() with id as key)
+    :param filename: the filename of the attachment
+    :param sha1: SHA1 sum of the file to check its integrity
+    :param attachment_type: one of "DOCUMENT", "SOURCE", "SOURCE_SELF"
+           "CLEARING_REPORT", "COMPONENT_LICENSE_INFO_XML", "BINARY",
+           "BINARY_SELF", "LICENSE_AGREEMENT", "README_OSS"
+    :param kwargs: additional relase details as specified in the SW360 REST API
+    :type json: SW360 JSON object
+    :type attachment_id: string
+    :type release_id: string
+    :type filename: string
+    :type sha1: string
+    :type attachment_type: string
+    :type kwargs: dictionary
+    """
+    def __init__(self, json=None, attachment_id=None, resources={},
+                 filename=None, sha1=None, attachment_type=None, **kwargs):
+        self.resources = resources
+        self.filename = filename
+        self.sha1 = sha1
+        self.attachment_type = attachment_type
+        super().__init__(json, attachment_id, **kwargs)
+
+    def from_json(self, json):
+        """Parse attachment JSON object from SW360 REST API. For now, we don't
+        support parsing the resource the attachment belongs to, so this needs
+        to be set via constructur.
+
+        All details not directly supported by this class will be stored as-is
+        in the `details` instance attribute.
+        Please note that this might change in future if better abstractions
+        will be added in this Python library."""
+        for key, value in json.items():
+            if key in ("filename", "sha1"):
+                self.__setattr__(key, value)
+            elif key == "attachmentType":
+                self.attachment_type = value
+            elif key == "_links":
+                for links_key, links_value in value.items():
+                    if links_key == "self":
+                        self.id = links_value["href"].split("/")[-1]
+                    else:
+                        self.details.setdefault(key, {})
+                        self.details[key][links_key] = links_value
+            else:
+                self.details[key] = value
+
+    def __repr__(self):
+        """Representation string."""
+        return "<Attachment %s id:%s>" % (self.filename, self.id)
+
+
+class Component(SW360Resource):
     """A component is the SW360 abstraction for a single software
     package/library/program/etc.
 
@@ -94,37 +190,31 @@ class Component:
     For JSON parsing, please read documentation of from_json() method.
 
     :param json: create component from SW360 JSON object by calling from_json()
+    :param component_id: id of the component (if exists in SW360 already)
     :param name: name of the component
     :param description: short description for component
     :param homepage: homepage of the component
     :param component_type: one of "INTERNAL", "OSS", "COTS", "FREESOFTWARE",
                            "INNER_SOURCE", "SERVICE", "CODE_SNIPPET"
     :param kwargs: additional component details as specified in the SW360 REST API
     :type json: SW360 JSON object
+    :type component_id: string
     :type name: string
     :type description: string
     :type homepage: string
     :type component_type: string
     :type kwargs: dictionary
     """
-    def __init__(self, json=None, name=None, description=None, homepage=None,
-                 component_type=None, **kwargs):
-        self.details = {}
-        """All release details which are not explicitely supported by the
-        constructor parameters are stored in the `details` attribute. Shall use
-        names and types as specified in SW360 REST API."""
-
+    def __init__(self, json=None, component_id=None, name=None, description=None,
+                 homepage=None, component_type=None, **kwargs):
         self.releases = {}
+        self.attachments = {}
 
-        if json is not None:
-            self.from_json(json)
-        else:
-            self.name = name
-            self.description = description
-            self.homepage = homepage
-            self.component_type = component_type
-            for key, value in kwargs:
-                self.details[key] = value
+        self.name = name
+        self.description = description
+        self.homepage = homepage
+        self.component_type = component_type
+        super().__init__(json, component_id, **kwargs)
 
     def from_json(self, json):
         """Parse component JSON object from SW360 REST API. Information for
@@ -138,7 +228,8 @@ def from_json(self, json):
         as-is in `details['_embedded']['sw360:vendors']` and
         `details['externalIds'].  Please note that this might change in future
         if better abstractions will be added in this Python library."""
-        releases = None
+        releases = []
+        attachments = []
         for key, value in json.items():
             if key in ("name", "description", "homepage"):
                 self.__setattr__(key, value)
@@ -150,20 +241,24 @@ def from_json(self, json):
                         self.id = links_value["href"].split("/")[-1]
                     elif links_key == "sw360:releases":
                         releases = links_value
+                    elif links_key == "sw360:attachments":
+                        attachments = links_value
                     else:
                         self.details.setdefault(key, {})
                         self.details[key][links_key] = links_value
             else:
                 self.details[key] = value
 
-        if releases is None:
-            return
-
         for release_json in releases:
             release = Release(component_id=self.id)
             release.from_json(release_json)
             self.releases[release.id] = release
 
+        for attachment_json in attachments:
+            attachment = Attachment(resources=[self])
+            attachment.from_json(attachment_json)
+            self.attachments[attachment.id] = attachment
+
     def __repr__(self):
         """Representation string."""
         return "<Component %s id:%s>" % (self.name, self.id)