Added support for Activities

src/domain.py

@@ -286,4 +286,26 @@ class Dataset(Gcisbase):
         if match:
             self._publication_year = match.group()
         else:
-            self._publication_year = None
\ No newline at end of file
+            self._publication_year = None
+            
+            
+class Activity(Gcisbase):
+    def __init__(self, data):
+        self.gcis_fields = ['start_time', 'uri', 'methodology', 'data_usage', 'href', 'metholodogies', 'end_time',
+                            'output_artifacts', 'duration', 'identifier', 'publication_maps', 'computing_environment']
+
+        self.translations = {
+            'how_much_time_was_invested_in_creating_the_image': 'duration',
+            '35_what_are_all_of_the_files_names_and_extensions_associated_with_this_image': 'output_artifacts',
+            'what_operating_systems_and_platforms_were_used': 'computing_environment',
+            'what_analytical_statistical_methods_were_employed_to_the_data': 'methodology',
+            'describe_how_the_data_was_used_in_the_image_figure_creation': 'data_usage'
+
+        }
+
+        super(Activity, self).__init__(data, fields=self.gcis_fields, trans=self.translations)
+
+    def as_json(self, indent=0):
+        return super(Activity, self).as_json(omit_fields=['metholodogies', 'publication_maps'])
+
+

src/gcis_client.py

@@ -5,7 +5,7 @@ import urllib
 import json
 import requests
 from os.path import exists, basename
-from domain import Figure, Image, Dataset
+from domain import Figure, Image, Dataset, Activity
 
 
 def check_image(fn):
@@ -31,6 +31,16 @@ def exists(fn):
     return wrapped
 
 
+def http_resp(fn):
+    def wrapped(*args, **kwargs):
+        resp = fn(*args, **kwargs)
+        if resp.status_code == 200:
+            return resp
+        else:
+            raise Exception(resp.text)
+    return wrapped
+
+
 class GcisClient(object):
     def __init__(self, url, username, password):
         self.headers = {
@@ -94,21 +104,25 @@ class GcisClient(object):
     @check_image
     def create_image(self, image, report_id=None, figure_id=None):
         url = '{b}/image/'.format(b=self.base_url, img=image.identifier)
-        responses = [requests.post(url, image.as_json(), headers=self.headers)]
+        resp = requests.post(url, image.as_json(), headers=self.headers)
         if image.local_path is not None:
-            responses.append(self.upload_image_file(image.identifier, image.local_path))
+            self.upload_image_file(image.identifier, image.local_path)
         if figure_id and report_id:
-            responses.append(self.associate_image_with_figure(image.identifier, report_id, figure_id))
+            self.associate_image_with_figure(image.identifier, report_id, figure_id)
         for dataset in image.datasets:
-            self.associate_dataset_with_image(dataset.identifier, image.identifier)
+            self.create_activity(dataset.activity)
+            self.associate_dataset_with_image(dataset.identifier, image.identifier,
+                                              activity_id=dataset.activity.identifier)
 
-        return responses
+        return resp
 
     @check_image
     def update_image(self, image):
         update_url = '{b}/image/{img}'.format(b=self.base_url, img=image.identifier)
         for dataset in image.datasets:
-            self.associate_dataset_with_image(dataset.identifier, image.identifier)
+            self.update_activity(dataset.activity)
+            self.associate_dataset_with_image(dataset.identifier, image.identifier,
+                                              activity_id=dataset.activity.identifier)
 
         return requests.post(update_url, image.as_json(), headers=self.headers)
 
@@ -240,20 +254,78 @@ class GcisClient(object):
         url = '{b}/dataset/{ds}'.format(b=self.base_url, ds=dataset.identifier)
         return requests.delete(url, headers=self.headers)
 
-    def associate_dataset_with_image(self, dataset_id, image_id):
+    def associate_dataset_with_image(self, dataset_id, image_id, activity_id=None):
         url = '{b}/image/prov/{img}'.format(b=self.base_url, img=image_id)
+
         data = {
             'parent_uri': '/dataset/' + dataset_id,
             'parent_rel': 'prov:wasDerivedFrom'
         }
+        if activity_id:
+            data['activity'] = activity_id
+
+        self.delete_dataset_image_assoc(dataset_id, image_id)
         resp = requests.post(url, data=json.dumps(data), headers=self.headers)
 
         if resp.status_code == 200:
             return resp
         #TODO: Change to 409 in next release
         elif resp.status_code == 400:
+            print resp.text
             print 'Duplicate dataset association {ds} for image: {img}'.format(ds=dataset_id, img=image_id)
             return resp
         else:
             raise Exception('Dataset association failed:\n{url}\n{resp}'.format(url=url, resp=resp.text))
 
+    def delete_dataset_image_assoc(self, dataset_id, image_id):
+        url = '{b}/image/prov/{img}'.format(b=self.base_url, img=image_id)
+
+        data = {
+            'delete': {
+                'parent_uri': '/dataset/' + dataset_id,
+                'parent_rel': 'prov:wasDerivedFrom'
+            }
+        }
+        print data
+
+        print json.dumps(data)
+        resp = requests.post(url, data=json.dumps(data), headers=self.headers)
+
+        if resp.status_code == 200:
+            return resp
+        else:
+            print resp.status_code
+            raise Exception('Dataset dissociation failed:\n{url}\n{resp}'.format(url=url, resp=resp.text))
+
+    # @exists
+    def activity_exists(self, activity_id):
+        url = '{b}/activity/{act}'.format(b=self.base_url, act=activity_id)
+        resp = requests.head(url, headers=self.headers)
+        if resp.status_code == 200:
+            return True
+        else:
+            return False
+
+    def get_activity(self, activity_id):
+        url = '{b}/activity/{act}'.format(b=self.base_url, act=activity_id)
+        resp = requests.get(url, headers=self.headers, verify=False)
+        try:
+            return Activity(resp.json())
+        except ValueError:
+            raise Exception(resp.text())
+
+    @http_resp
+    def create_activity(self, activity):
+        url = '{b}/activity/'.format(b=self.base_url)
+        return requests.post(url, data=activity.as_json(), headers=self.headers)
+
+    @http_resp
+    def update_activity(self, activity):
+        url = '{b}/activity/{act}'.format(b=self.base_url, act=activity.identifier)
+        return requests.post(url, data=activity.as_json(), headers=self.headers)
+
+    @http_resp
+    def delete_activity(self, activity):
+        url = '{b}/activity/{act}'.format(b=self.base_url, act=activity.identifier)
+        return requests.delete(url, headers=self.headers)
+

src/webform_client.py

@@ -6,7 +6,7 @@ import re
 from os.path import join
 from dateutil.parser import parse
 
-from domain import Figure, Image, Dataset
+from domain import Figure, Image, Dataset, Activity
 
 
 def sanitized(pattern):
@@ -72,6 +72,15 @@ class WebformClient:
                         dataset.spatial_extent = ' '.join(['{k}: {v};'.format(k=key, v=dataset_json[key]) for key in
                                                            ['maximum_latitude', 'minimum_latitude', 'maximum_longitude',
                                                             'minimum_longitude']])
+
+                        #Filter overlapping Dataset keys out
+                        activity_json = {k: dataset_json[k] for k in dataset_json if
+                                         k not in ['href', 'uri', 'identifier', 'start_time', 'end_time']}
+
+                        #Add synthetic identifier
+                        activity_json['identifier'] = dataset.identifier + '-process'
+                        dataset.activity = Activity(activity_json)
+
                         #TODO: Extract DOIs from citation
                         image_obj.datasets.append(dataset)