ciocore 6.3.2rc1__py2.py3-none-any.whl → 6.4.0__py2.py3-none-any.whl

ciocore/uploader/_uploader.py

@@ -728,12 +728,6 @@ class Uploader(object):
 
         return True
 
-    def assets_only(self, *paths):
-        processed_filepaths = file_utils.process_upload_filepaths(paths)
-        file_map = {path: None for path in processed_filepaths}
-        self.handle_upload_response(project=None, upload_files=file_map)
-
-
     def handle_upload_response(self, project, upload_files, upload_id=None):
         """
         This is a really confusing method and should probably be split into to clear logic
@@ -916,6 +910,7 @@ def set_logging(level=None, log_dirpath=None):
         log_filepath=log_filepath,
     )
 
+
 def run_uploader(args):
     """
     Start the uploader process. This process will run indefinitely, polling
@@ -945,6 +940,7 @@ def run_uploader(args):
     else:
         uploader.main()
 
+
 def get_file_info(filepath):
     """
     For the given filepath return the following information in a dictionary:

ciocore-6.4.0.data/scripts/conductor

@@ -0,0 +1,19 @@
+#!python
+# -*- coding: utf-8 -*-
+# WHY CHANGE
+
+# DO NOT SORT IMPORTS
+import os
+import re
+import sys
+
+CIO_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+sys.path.insert(0, CIO_DIR)
+
+print("Inserted {} into sys.path".format(CIO_DIR))
+
+from ciocore.cli.conductor import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

ciocore-6.4.0.data/scripts/conductor.bat

@@ -0,0 +1,13 @@
+@echo off
+
+echo Looking for Python...
+
+WHERE python.exe
+if ERRORLEVEL 1 (  
+    echo WARNING: python.exe not found.
+    echo Please find or install Python and add it to your Path variable. Then run this command again.
+    echo If you don't want to add python to your Path, then you can use the full path to a Python installation.
+    echo Example: "C:\some\tools\python\python.exe" "%~dp0conductor %*
+    exit /b
+)
+python.exe "%~dp0\conductor" %*

{ciocore-6.3.2rc1.dist-info → ciocore-6.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 6.3.2rc1
+Version: 6.4.0
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -9,23 +9,21 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
 Description-Content-Type: text/markdown
-Requires-Dist: certifi (==2019.11.28)
-Requires-Dist: pyjwt (==1.7.1)
-Requires-Dist: requests (<=2.25.1,>=2.10.0)
-Requires-Dist: future (>=0.18.2)
-Requires-Dist: urllib3 (==1.25.11)
-Requires-Dist: cioseq (<1.0.0,>=0.1.14)
-Requires-Dist: Click
-Requires-Dist: markdown
+Requires-Dist: certifi ==2019.11.28
+Requires-Dist: pyjwt ==1.7.1
+Requires-Dist: requests <=2.25.1,>=2.10.0
+Requires-Dist: future >=0.18.2
+Requires-Dist: urllib3 ==1.25.11
 
-## Introduction
+# Conductor Core
 
-Conductor Core is a Python package that provides an API and a command-line interface for interacting with Conductor.
+Use the command-line uploader and downloader or develop your own tools using the Python API.
 
 ## Install
 
+**To install the latest version.**
 ```bash
-pip install ciocore
+pip install --upgrade ciocore
 ```
 
 Run the conductor command to confirm the package was installed.
@@ -33,13 +31,6 @@ Run the conductor command to confirm the package was installed.
 conductor --help
 ```
 
-Get help for a specific sub command
-```bash
-conductor downloader --help
-conductor uploader --help
-conductor software --help
-```
-
 Example API usage
 ```python
 from ciocore import api_client
@@ -52,23 +43,9 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Changelog
 
-## Version:6.3.2-rc.1 -- 20 Aug 2023
-
-  * Adds instance-type-tagger for demonstration purposes.
-  * Adds ability to query the provider, so that spot/preemptible can be hidden on CW.
-  * Implements dedicated docs for the Conductor Core (`ciocore`) package.
-
-## Version:6.3.1-rc.3 -- 24 Jul 2023
-
-  * This release has an improved commandline experience. The new subcommands, `upload` and `download` have a more idiomatic feel, and better control over what gets uploaded or downloaded. The old commands `uploader` and `downloader` are still available, but are deprecated.
-  * There's also now a `packages` subcommand that allows you to query the package database.
-  * The command installs with console_scripts which improves stability and avoids situations wehere the Conductor command cannot be3 found. (#72)
-  * Adds a `--version` flag
-
-## Version:6.3.1-rc.2 -- 23 Jul 2023
+## Version:6.4.0 -- 12 Sep 2023
 
-* Fixes missing import.
-* Improves uploader error handling and queueing fixes.
+* Uploader now supports callbacks and is interruptable
 
 ## Version:6.3.0 -- 05 Jul 2023
 

ciocore-6.4.0.dist-info/RECORD

@@ -0,0 +1,51 @@
+ciocore/VERSION,sha256=Yl4u2S_TJL-hz2vF8sZWuwgSXkwNAQL0sIXjVAPmLZU,5
+ciocore/__about__.py,sha256=nTb4Xx0r9QtGROSFKgwDZ-Mr2LKjm2wVt1OkMQAkRAQ,241
+ciocore/__init__.py,sha256=zB_e7gBW2QloqbrGzcvccfpZhOhd6o9KACnScrwylm8,25
+ciocore/api_client.py,sha256=O9uvtnqgmE2IRkqlP9DoPn6CX_HAIuSLo9je5Om-800,17913
+ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
+ciocore/common.py,sha256=FnggAL-IGW8VQB6kLsrKLnxWFgLpwGBhOtiZSHz130M,14725
+ciocore/compat.py,sha256=5uEXPSog_jxsDMaHBswAKEtfyXT25VgU6WNGIhz9PHU,256
+ciocore/conductor_submit.py,sha256=ONE0LsA5hGavTJIOXXYx8qzl8_vBPADwhd6Ytq_0E0c,9382
+ciocore/config.py,sha256=fcxnwaYmNAmvMXQeb5V-86Pwwy3a3NTPCA0CSLqog3s,5913
+ciocore/data.py,sha256=G6tAfSkMwy3DS_fesqkDaoMgrfd_JrvV8Fs_JFpcCCc,8950
+ciocore/downloader.py,sha256=oRmRePdIx_GdQwM39ipl9_e2c2ZkcGJRanuHOZmqpTM,51147
+ciocore/exceptions.py,sha256=4Oq-WX-qiN6kPUdBCHvvd6mtSQ0nCkDbJxWt2CNtpv8,1504
+ciocore/file_utils.py,sha256=bAlL31B4YkRgX-yT8kF8UXBFktQlsE1PvxbKqTeAeOU,17174
+ciocore/hardware_set.py,sha256=txcSLrVSNewRGxKLye-wuM8szGMVloU29ktL8WHdUtM,5401
+ciocore/loggeria.py,sha256=dKKJC8ZtRZdghqD5R5XrA6eDoy8gKacfeTA-zNzXvDE,13482
+ciocore/package_environment.py,sha256=oEbNKXRtPSPzKR-yCoKtvgzu4OCmr-zaqAcNoLAN9Uk,7238
+ciocore/package_tree.py,sha256=kH03HVfjomj7nsaxJJtr-1KSQ_9ZSQY5msG_l9btvg8,16277
+ciocore/post_install.py,sha256=zu5Ctz2ANbKD-f5G2ODLIhKkWENBi4F3UKKu50OEWrg,1000
+ciocore/validator.py,sha256=f_K7gxz122W_i5AxVx6dKhckOygl8TnmQiVj7tyX5zw,2344
+ciocore/worker.py,sha256=_WQq2_ZhXuc5NTfYQtcWUGULU6IUZykeVW5e_4_ffZc,21728
+ciocore/auth/__init__.py,sha256=cdS-xZzMq41yXM5cz8sUlcYgo8CJYh8HcCCWmhbDgf0,606
+ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
+ciocore/cli/__init__.py,sha256=RmZKWJaMpzNyMdyYc2W3VXglaJiC8vyR2cgUlA-9Qmw,26
+ciocore/cli/conductor.py,sha256=snmlICkMgP94ZPKl6J7g299deB75QwGDWI0oCnZPfSI,10861
+ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
+ciocore/uploader/_uploader.py,sha256=31lpXVp2VG6rzVF7nw24Uafs6Z-p9CUF_bghku386R4,37430
+ciocore/uploader/upload_stats/__init__.py,sha256=kc1YCXZOy4EBpSSRIJKe89DWgiBwTzOPMbZ7530EXWw,5354
+ciocore/uploader/upload_stats/stats_formats.py,sha256=dtjsxdbT4w6BXFay19dzijf-xLwf6TktNk75Wq3rPAw,2452
+ciocore-6.4.0.data/scripts/conductor,sha256=Nk3QsLQqbUUrtaKDp4b5mr9__4tz-xnssENpQe5vuIo,409
+ciocore-6.4.0.data/scripts/conductor.bat,sha256=T1_9ByheubBczgQZn8_LwfvMtWgE7Bt64EsEScnSXMs,447
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/instance_type_fixtures.py,sha256=gR6ordfghp34I94oM2eDg6jfIe5HAwE644GKIwspuW8,3469
+tests/package_fixtures.py,sha256=CsJnhB7oYzIxJH7b1tCOPyvnnVSCqEbSPhtCnsHL-nA,5070
+tests/test_api_client.py,sha256=dWOmAIKmX0gLaDGsT9VfAq9Hcs9HIQf2P5IMM_Bt5dE,1284
+tests/test_common.py,sha256=lJpzRdL-7u4McXFbLuwPQQoUnuEOnCVQtZEt6e_dIYs,638
+tests/test_config.py,sha256=nSmpinX2SmDNAprIcxs9UHdB0VakJB0snXaZmAoKJSc,12863
+tests/test_data.py,sha256=YdP1kZJivQ6yb9z96UK6oMDaOfJAl4YMJqzKvlCQaes,5744
+tests/test_hardware_set.py,sha256=TcBh63rOxf1rKXxKlCPSnHueBFlz7rNP6BcoJjgVvPs,3065
+tests/test_imports_2and3.py,sha256=ehqpRYPVY7djBcb8OT_cnh86iCJJ9wuMWnfSR9RHxmY,507
+tests/test_package_environment.py,sha256=CdiC2PDVSnbcwTb4fsDTWqGYSzs1n5ca2KMoyISckGA,5893
+tests/test_package_tree.py,sha256=xCwNwYUmJrfmgCP2FGoHRFG-L0JPy8s4-66icxAls4o,6780
+tests/test_submit.py,sha256=4idfa48IouM4JgfQzBLiZyygtU-jwLdOBtV0AgfBzH0,4834
+tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
+tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
+tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/mocks/api_client_mock.py,sha256=Wfv2JPFSZfyHftVqsqxcpXWJn136pEHx26I_esz567E,943
+tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
+ciocore-6.4.0.dist-info/METADATA,sha256=ObyBNodNf9WIBCAKwIsWMLC5NAOfsCZhpLFdniY7-_0,14364
+ciocore-6.4.0.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+ciocore-6.4.0.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-6.4.0.dist-info/RECORD,,

{ciocore-6.3.2rc1.dist-info → ciocore-6.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/instance_type_fixtures.py

@@ -55,46 +55,12 @@ WIN_INSTANCE_TYPES = [
 
 ALL_INSTANCE_TYPES = WIN_INSTANCE_TYPES + LIN_INSTANCE_TYPES
 
-AWS_INSTANCE_TYPES = [
- {
-      "cloud": "aws",
-      "cpu": 72,
-      "memory": 144,
-      "name": "c5.18xlarge",
-      "orchestrator": "batch",
-      "operating_system": "linux",
-      "cores": 72,
-       "description": "c5  18xlarge",
-  },
-  {
-      "cloud": "aws",
-      "cpu": 2,
-      "memory": 8,
-      "name": "m5.large",
-      "orchestrator": "batch",
-      "operating_system": "linux",
-      "cores": 2,
-      "description": "m large",
-  },
-  {
-      "cloud": "aws",
-      "cpu": 4,
-      "memory": 16,
-      "name": "m5.xlarge",
-      "orchestrator": "batch",
-      "operating_system": "linux",
-      "cores": 4,
-      "description": "m5 xlarge",
-  }
-]
-
-
 
 CW_INSTANCE_TYPES = [
     {
         "cores": 4,
         "memory": 16,
-        "name": "cw-a-4-16",
+        "name": "a-4-16",
         "categories": [{"label": "low", "order": 1}, {"label": "extra", "order": 9}],
         "operating_system": "linux",
         "description": "Desc 4 C 16 M A",
@@ -102,7 +68,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 8,
         "memory": 16,
-        "name": "cw-b-8-16",
+        "name": "b-8-16",
         "categories": [{"label": "low", "order": 1}],
         "operating_system": "linux",
         "description": "Desc 8 C 16 M B",
@@ -110,7 +76,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 4,
         "memory": 32,
-        "name": "cw-c-4-32",
+        "name": "c-4-32",
         "categories": [{"label": "mid", "order": 2}, {"label": "extra", "order": 9}],
         "operating_system": "linux",
         "description": "Desc 4 C 32 M C",
@@ -118,7 +84,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 8,
         "memory": 32,
-        "name": "cw-d-8-32",
+        "name": "d-8-32",
         "categories": [{"label": "mid", "order": 2}],
         "operating_system": "linux",
         "description": "Desc 8 C 32 M D",
@@ -126,7 +92,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 4,
         "memory": 64,
-        "name": "cw-e-4-32",
+        "name": "e-4-32",
         "categories": [{"label": "high", "order": 3}, {"label": "extra", "order": 9}],
         "operating_system": "linux",
         "description": "Desc 4 C 32 M E",
@@ -134,7 +100,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 8,
         "memory": 64,
-        "name": "cw-f-8-32",
+        "name": "f-8-32",
         "categories": [{"label": "high", "order": 3}],
         "operating_system": "linux",
         "description": "Desc 8 C 32 M F",
@@ -142,7 +108,7 @@ CW_INSTANCE_TYPES = [
     {
         "cores": 8,
         "memory": 64,
-        "name": "cw-g-8-32",
+        "name": "g-8-32",
         "categories": None,
         "operating_system": "linux",
         "description": "Desc 8 C 32 M G",
@@ -153,7 +119,7 @@ CW_INSTANCE_TYPES_WITH_GPUS = [
     {
         "cores": 8,
         "memory": 64,
-        "name": "cw-f-8-32-gpu",
+        "name": "f-8-32-gpu",
         "categories": [{"label": "high", "order": 3}],
         "operating_system": "linux",
         "description": "Desc 8 C 32 M F gpu",
@@ -162,7 +128,7 @@ CW_INSTANCE_TYPES_WITH_GPUS = [
     {
         "cores": 8,
         "memory": 64,
-        "name": "cw-g-8-32-gpu",
+        "name": "g-8-32-gpu",
         "categories":  [{"label": "high", "order": 3}],
         "operating_system": "linux",
         "description": "Desc 8 C 32 M G gpu",

tests/mocks/api_client_mock.py

@@ -0,0 +1,31 @@
+"""Mock ApiClient for requests to get packages and projects.
+"""
+import json
+import os
+
+import package_fixtures
+
+PROJECTS_RESPONSE = {"data": [
+    {"id": "123|deadpool", "name": "Deadpool",
+     "status": "active"},
+    {"id": "456|harrypotter", "name": "Harry Potter & the chamber of secrets",
+     "status": "active"},
+    {"id": "789|corelli", "name": "Captain Corelli's Mandolin",
+     "status": "active"},
+    {"id": "000|gwtw", "name": "Gone with the Wind",
+     "status": "inactive"}
+]}
+
+PACKAGES_RESPONSE = {"data": package_fixtures.SOFTWARE_DATA}
+
+class ApiClient(object):
+    def make_request(self, **kw):
+        path = kw.get("uri_path", "")
+
+        print("Using mock %s call to %s" % (self.__class__.__name__, path))
+
+        if path.startswith("api/v1/projects"):
+            return [json.dumps(PROJECTS_RESPONSE), 200]
+
+        if path.startswith("api/v1/ee/packages"):
+            return [json.dumps(PACKAGES_RESPONSE), 200]

tests/test_hardware_set.py

@@ -15,7 +15,7 @@ PROJECTS = [
 ]
 
 from package_fixtures import *
-from instance_type_fixtures import CW_INSTANCE_TYPES, AWS_INSTANCE_TYPES, CW_INSTANCE_TYPES_WITH_GPUS, ALL_INSTANCE_TYPES
+from instance_type_fixtures import CW_INSTANCE_TYPES, CW_INSTANCE_TYPES_WITH_GPUS, ALL_INSTANCE_TYPES
 
 
 class TestCategorizedInstanceTypes(unittest.TestCase):
@@ -31,20 +31,13 @@ class TestCategorizedInstanceTypes(unittest.TestCase):
 
     def test_content_count(self):
         low_category_values = [c["value"] for c in self.hs.get_model()[0]["content"]]
-        self.assertEqual(low_category_values, ["cw-a-4-16", "cw-b-8-16"])
+        self.assertEqual(low_category_values, ["a-4-16", "b-8-16"])
 
     def test_in_several_categories(self):
         low_category_values = [c["value"] for c in self.hs.get_model()[0]["content"]]
         extra_category_values = [c["value"] for c in self.hs.get_model()[3]["content"]]
-        self.assertIn("cw-a-4-16", low_category_values)
-        self.assertIn("cw-a-4-16", extra_category_values)
-
-    def test_category_names(self):
-        
-        names =  self.hs.labels()
-        self.assertEqual(names, ["low", "mid", "high", "extra"])
-
-
+        self.assertIn("a-4-16", low_category_values)
+        self.assertIn("a-4-16", extra_category_values)
 
 class TestRecategorizeInstanceTypes(unittest.TestCase):
     def setUp(self):
@@ -71,29 +64,6 @@ class TestRecategorizeInstanceTypes(unittest.TestCase):
         self.assertEqual(result["label"] , label)
         self.assertEqual(result["order"] , 2)
         
-
-
-
-class TestFind(unittest.TestCase):
-    def setUp(self):
-        self.hs = HardwareSet(CW_INSTANCE_TYPES_WITH_GPUS)
-        
-    def test_find_unspecified_category(self):
-        result = self.hs.find("cw-e-4-32")
-        self.assertIsNotNone(result)
-
-    def test_category_that_exists(self):
-        result = self.hs.find("cw-e-4-32", category="high")
-        self.assertIsNotNone(result)
-        
-    def test_returns_none_if_not_in_category(self):
-        result = self.hs.find("cw-e-4-32", category="low")
-        self.assertIsNone(result)
-        
-    def test_returns_none_if_non_existent_category(self):
-        result = self.hs.find("cw-e-4-32", category="foo")
-        self.assertIsNone(result)
-        
 class TestUncategorizedInstanceTypes(unittest.TestCase):
     def setUp(self):
         self.hs = HardwareSet(ALL_INSTANCE_TYPES)
@@ -116,19 +86,3 @@ class TestUncategorizedInstanceTypes(unittest.TestCase):
                 "64 core, 416GB Mem",
             ],
         )
-
-        
-class TestProvider(unittest.TestCase):
-
-    def test_gcp_provider(self):
-        hs = HardwareSet(ALL_INSTANCE_TYPES)
-        self.assertEqual(hs.provider, "gcp")
-        
-    def test_cw_provider(self):
-        hs = HardwareSet(CW_INSTANCE_TYPES_WITH_GPUS)
-        self.assertEqual(hs.provider, "cw")
-        
-    def test_aws_provider(self):
-        hs = HardwareSet(AWS_INSTANCE_TYPES)
-        self.assertEqual(hs.provider, "aws")
-