X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/36f80655c840b0d7393f82056c05858e29c123cf..b14bc80d764b85a6ddfed32198b2144b5adf2637:/crunch_scripts/pgp-survey-import

diff --git a/crunch_scripts/pgp-survey-import b/crunch_scripts/pgp-survey-import
index 8d9b3d5855..4e11812e0a 100755
--- a/crunch_scripts/pgp-survey-import
+++ b/crunch_scripts/pgp-survey-import
@@ -30,54 +30,54 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
         words = string.split(string.strip(line), "\t")
         if line_number == 0:
             headings = words
-            for t in arvados.service.traits().list(
-                where=json.dumps({'name':words}),
+            for t in arvados.api('v1').traits().list(
+                where={'name':words},
                 limit=1000
                 ).execute()['items']:
                 traits[t['name']] = t
             for i, trait_name in enumerate(words[3:], start=3):
                 # find or create trait
                 if trait_name not in traits:
-                    traits_match = arvados.service.traits().list(
-                        where=json.dumps({'name':trait_name})
+                    traits_match = arvados.api('v1').traits().list(
+                        where={'name':trait_name}
                         ).execute()['items']
                     if len(traits_match) > 0:
                         traits[trait_name] = traits_match[0]
                     else:
-                        traits[trait_name] = arvados.service.traits().create(
-                            trait=json.dumps({'name':trait_name})).execute()
+                        traits[trait_name] = arvados.api('v1').traits().create(
+                            trait={'name':trait_name}).execute()
                 out.write(separator)
                 out.write(json.dumps(traits[trait_name]))
                 separator = ",\n"
         else:
-            huID_links_match = arvados.service.links().list(
-                where=json.dumps({'link_class':'identifier','name':words[0]})
+            huID_links_match = arvados.api('v1').links().list(
+                where={'link_class':'identifier','name':words[0]}
                 ).execute()['items']
             if len(huID_links_match) > 0:
                 human_uuid = huID_links_match[0]['head_uuid']
             else:
-                human = arvados.service.humans().create(
-                    human=json.dumps({})
+                human = arvados.api('v1').humans().create(
+                    body={}
                     ).execute()
-                huID_link = arvados.service.links().create(
-                    link=json.dumps({
-                            'link_class':'identifier',
-                            'name':words[0],
-                            'head_kind':'arvados#human',
-                            'head_uuid':human['uuid']
-                            })
+                huID_link = arvados.api('v1').links().create(
+                    body={
+                        'link_class':'identifier',
+                        'name':words[0],
+                        'head_kind':'arvados#human',
+                        'head_uuid':human['uuid']
+                        }
                     ).execute()
                 human_uuid = human['uuid']
             human_trait = {}
-            for t in arvados.service.links().list(
+            for t in arvados.api('v1').links().list(
                 limit=10000,
-                where=json.dumps({
+                where={
                     'tail_uuid':human_uuid,
                     'tail_kind':'arvados#human',
                     'head_kind':'arvados#trait',
                     'link_class':'human_trait',
                     'name':'pgp-survey-response'
-                    })
+                    }
                 ).execute()['items']:
                 human_trait[t['head_uuid']] = t
             for i, trait_value in enumerate(words[3:], start=3):
@@ -87,9 +87,9 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
                     if trait_link['properties']['value'] != trait_value:
                         # update database value to match survey response
                         trait_link['properties']['value'] = trait_value
-                        arvados.service.links().update(
+                        arvados.api('v1').links().update(
                             uuid=trait_link['uuid'],
-                            link=json.dumps({'properties':trait_link['properties']})
+                            body={'properties':trait_link['properties']}
                             ).execute()
                     out.write(",\n")
                     out.write(json.dumps(trait_link))
@@ -106,8 +106,8 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
                         'name':'pgp-survey-response',
                         'properties': { 'value': trait_value }
                         }
-                    arvados.service.links().create(
-                        link=json.dumps(trait_link)
+                    arvados.api('v1').links().create(
+                        body=trait_link
                         ).execute()
                     out.write(",\n")
                     out.write(json.dumps(trait_link))