changeset 2:7b6021997b8e draft

planemo upload commit f36456464c692ed9d39a9cf654d09fe793113cce-dirty
author stevecassidy
date Tue, 30 Aug 2016 21:06:27 -0400
parents 6fef3489d97c
children c0569deac8d9
files __pycache__/pyalveo.cpython-35.pyc alveo_api_key.py alveo_get_item_data.py alveo_get_primary_text.py alveo_item_list_downloader.py alveo_item_list_importer.py austalk-select-hVd-words.py test
diffstat 8 files changed, 26 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
Binary file __pycache__/pyalveo.cpython-35.pyc has changed
--- a/alveo_api_key.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/alveo_api_key.py	Tue Aug 30 21:06:27 2016 -0400
@@ -27,7 +27,7 @@
     :raises: pyalveo.APIError if the API request is not successful
 
     """
-    client = client_module.Client(api_key, API_URL)
+    client = client_module.Client(api_key, API_URL, use_cache=False)
     outfile = open(output_path, 'w')
     outfile.write(api_key)
     outfile.close()
@@ -41,4 +41,4 @@
         sys.exit(1)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
--- a/alveo_get_item_data.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/alveo_get_item_data.py	Tue Aug 30 21:06:27 2016 -0400
@@ -31,6 +31,7 @@
         for row in csvreader:
             itemurls.append(row['ItemURL'])
 
+    print("ITEMS:", itemurls)
     itemlist = pyalveo.ItemGroup(itemurls, client)
 
     return itemlist
@@ -87,7 +88,7 @@
     try:
         api_key = open(args.api_key, 'r').read().strip()
 
-        client = pyalveo.Client(api_url=API_URL, api_key=api_key)
+        client = pyalveo.Client(api_url=API_URL, api_key=api_key, use_cache=False)
 
         item_list = read_item_list(args.item_list, client)
         patterns = args.patterns.split(',')
--- a/alveo_get_primary_text.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/alveo_get_primary_text.py	Tue Aug 30 21:06:27 2016 -0400
@@ -16,7 +16,7 @@
     return parser.parse_args()
 
 def get_item_list(api_key, item_list_url):
-    client = pyalveo.Client(api_key=api_key, api_url=API_URL)
+    client = pyalveo.Client(api_key=api_key, api_url=API_URL, use_cache=False)
     return client.get_item_list(item_list_url)
 
 # this file name pattern allows galaxy to discover the dataset designation and type
--- a/alveo_item_list_downloader.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/alveo_item_list_downloader.py	Tue Aug 30 21:06:27 2016 -0400
@@ -17,7 +17,7 @@
     return parser.parse_args()
 
 def get_item_list(api_key, item_list_url):
-    client = pyalveo.Client(api_key=api_key, api_url=API_URL)
+    client = pyalveo.Client(api_key=api_key, api_url=API_URL, use_cache=False)
     return client.get_item_list(item_list_url)
 
 # this file name pattern allows galaxy to discover the dataset designation and type
--- a/alveo_item_list_importer.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/alveo_item_list_importer.py	Tue Aug 30 21:06:27 2016 -0400
@@ -15,12 +15,12 @@
 
 # TODO: export common function to helper module
 def get_item_lists(api_key):
-    client = pyalveo.Client(api_key=api_key, api_url=API_URL)
+    client = pyalveo.Client(api_key=api_key, api_url=API_URL, use_cache=False)
     return client.get_item_lists()
 
 def write_table(item_lists, filename):
     with open(filename, 'w') as outfile:
-        for list_set in item_lists.itervalues():
+        for list_set in item_lists.values():
             for item_list in list_set:
                 outfile.write("%s (%d)\t%s\n" % (item_list['name'], item_list['num_items'], item_list['item_list_url']))
 
@@ -29,6 +29,7 @@
     try:
         api_key = open(args.api_key, 'r').read().strip()
         item_lists = get_item_lists(api_key)
+        print(item_lists)
         if item_lists:
             write_table(item_lists, args.output)
     except Exception as e:
--- a/austalk-select-hVd-words.py	Mon Aug 15 23:45:46 2016 -0400
+++ b/austalk-select-hVd-words.py	Tue Aug 30 21:06:27 2016 -0400
@@ -34,7 +34,7 @@
     """Find words in the Austalk corpus
     """
 
-    client = pyalveo.Client(api_key, API_URL)
+    client = pyalveo.Client(api_key, API_URL, use_cache=False)
 
     query = PREFIXES + """
 SELECT distinct ?item ?prompt ?compname
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test	Tue Aug 30 21:06:27 2016 -0400
@@ -0,0 +1,16 @@
+Adelaide (6840)	https://app.alveo.edu.au/item_lists/478
+austalk_catepillar (309)	https://app.alveo.edu.au/item_lists/64
+different (888)	https://app.alveo.edu.au/item_lists/132
+gum-tree (58)	https://app.alveo.edu.au/item_lists/84
+M&D_Test_140904 (10)	https://app.alveo.edu.au/item_lists/168
+rose (245)	https://app.alveo.edu.au/item_lists/82
+thistle (16)	https://app.alveo.edu.au/item_lists/83
+ace-specialised (122)	https://app.alveo.edu.au/item_lists/178
+austalk-adult-csl-child-match (250)	https://app.alveo.edu.au/item_lists/904
+austalk-digits (144)	https://app.alveo.edu.au/item_lists/517
+austalk_textgrid_sample (10)	https://app.alveo.edu.au/item_lists/484
+COOEE ALL (1354)	https://app.alveo.edu.au/item_lists/95
+cooee sample (129)	https://app.alveo.edu.au/item_lists/53
+dialogue-all (76)	https://app.alveo.edu.au/item_lists/116
+dialogue-sample (6)	https://app.alveo.edu.au/item_lists/180
+mdsample (20)	https://app.alveo.edu.au/item_lists/52