Merge pull request #7 from krasoffski/attach

Binary attachment support for issue #4

Author: avarabyeu

reportportal_client/model/request.py

@@ -66,21 +66,10 @@ def __init__(self, end_time=None, status=None, issue=None):
         self.issue = issue
 
 
-class File(RQ):
-    def __init__(self, name, content):
-        super(File, self).__init__()
-        self.name = name
-        self.content = content
-
-
 class SaveLogRQ(RQ):
-    def __init__(self, item_id=None, time=None, message=None, level=None,
-                 file_obj=None):
+    def __init__(self, item_id=None, time=None, message=None, level=None):
         super(SaveLogRQ, self).__init__()
         self.item_id = item_id
         self.time = time
         self.message = message
         self.level = level
-        self.file = None
-        if file_obj is not None:
-            self.file = file_obj.data

reportportal_client/service.py

@@ -1,3 +1,4 @@
+import json
 import requests
 
 from .model import (EntryCreatedRS, OperationCompletionRS)
@@ -72,3 +73,25 @@ def log(self, save_log_rq):
         url = self.uri_join(self.base_url, "log")
         r = self.session.post(url=url, json=save_log_rq.as_dict())
         return EntryCreatedRS(raw=r.text)
+
+    def attach(self, save_log_rq, name, data, mime="application/octet-stream"):
+        """Logs message with attachment.
+
+        Args:
+            save_log_rq: SaveLogRQ instance
+            name: name of attachment
+            data: fileobj or content
+            mime: content type for attachment
+
+        Returns:
+            An instance of EntryCreatedRS.
+        """
+        url = self.uri_join(self.base_url, "log")
+        dct = save_log_rq.as_dict()
+        dct["file"] = {"name": name}
+        files = {
+            "json_request_part": (None, json.dumps([dct]), "application/json"),
+            "file": (name, data, mime)
+        }
+        r = self.session.post(url=url, files=files)
+        return EntryCreatedRS(raw=r.text)