autoverse-cli 0.2.2__tar.gz → 0.4.0__tar.gz

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.2.2
+Version: 0.4.0
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoverse-cli"
-version = "0.2.2"
+version = "0.4.0"
 authors = [
   { name="Dan Kamrath", email="dan.kamrath@autonomalabs.com" },
 ]

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.2.2
+Version: 0.4.0
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/autoverse_cli.egg-info/SOURCES.txt

@@ -8,13 +8,16 @@ src/autoverse_cli.egg-info/entry_points.txt
 src/autoverse_cli.egg-info/top_level.txt
 src/avrs/__init__.py
 src/avrs/app_version.py
+src/avrs/argparse_help.py
 src/avrs/avrs.py
 src/avrs/cfg.py
 src/avrs/launcher.py
 src/avrs/launcher_util.py
 src/avrs/tests.py
 src/avrs/requests/can.py
+src/avrs/requests/code_booz.py
 src/avrs/requests/demo.py
+src/avrs/requests/edit_environment.py
 src/avrs/requests/input.py
 src/avrs/requests/log_path.py
 src/avrs/requests/move_to_landmark.py

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/app_version.py

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.2.2'
+    return '0.4.0'
 
 def check_app_is_latest():
     pass

autoverse_cli-0.4.0/src/avrs/argparse_help.py

@@ -0,0 +1,30 @@
+import argparse
+
+def generate_argparse_docs(parser):
+    """
+    Try to generate a nice markdown with all help from a parser
+    """
+    s = recursive_get_argparse_help(parser, 'avrs', True)
+    #print(s)
+
+    with open('out.txt', 'w', encoding='utf-8') as f:
+        f.write(s)
+
+def recursive_get_argparse_help(parser, parent_name, is_root):
+
+    s = ''
+    if not is_root:
+        s += '\n' + '_' * 72 + '\n\n'
+
+    s += '{}\n'.format(parent_name)
+    s += '{}\n'.format(parser.format_help())
+
+    for action in parser._actions:
+        if isinstance(action, argparse._SubParsersAction):
+            #s += '{}\n'.format(dir(action))
+            #s += '{}\n'.format(action._choices_actions)
+            #for a in action._choices_actions:
+            #   s += '{}\n'.format(a.dest)
+            for subcmd, subpsr in action.choices.items():
+                s += recursive_get_argparse_help(subpsr, parent_name + ' ' + subcmd, False)
+    return s

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/avrs.py

@@ -6,6 +6,7 @@ from argparse import RawTextHelpFormatter
 from avrs.app_version import *
 from avrs.cfg import *
 from avrs.launcher import *
+from avrs.argparse_help import *
 
 from avrs.requests.move_to_landmark import MoveToLandmarkRequest
 from avrs.requests.restart import Restart
@@ -18,6 +19,8 @@ from avrs.requests.vd import Vd
 from avrs.requests.input import InputRequest
 from avrs.requests.log_path import LogPath
 from avrs.requests.demo import AvrsDemoRequest
+from avrs.requests.edit_environment import AvrsEditEnvironmentRequests
+from avrs.requests.code_booz import *
 
 
 def get_version():
@@ -28,7 +31,7 @@ def main():
             prog='avrs', 
             description='Autoverse CLI',
             epilog='',
-            formatter_class=RawDescriptionHelpFormatter)
+            formatter_class=RawTextHelpFormatter)
 
     version_psr = parser.add_argument(
             '--version', 
@@ -54,11 +57,16 @@ def main():
     Vd(sps, cfg)
     #InputRequest(sps, cfg)
     LogPath(sps, cfg)
-    #AvrsDemoRequest(sps, cfg)
-    
+    AvrsEditEnvironmentRequests(sps, cfg)
+    AvrsCodeBoozRequest(sps, cfg)
+    AvrsDemoRequest(sps, cfg)
+
+    if os.environ.get('AVRS_GEN_DOCS', '0') == '1':
+        generate_argparse_docs(parser)
 
     args = parser.parse_args()
     args.func(args)
 
+
 if __name__ == '__main__':
     main()

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/launcher.py

@@ -11,7 +11,7 @@ class AvrsLauncher:
         self.cfg = cfg
         provision_parser = parent_parser.add_parser(
             'launcher', 
-            help='launcher operations, such as license registration or updating a sim install')
+            help='launcher operations, such as license registration or updating a sim install\n\n')
         sps = provision_parser.add_subparsers(required=True, help='launcher options')
 
         register_license_psr = sps.add_parser(

autoverse_cli-0.4.0/src/avrs/requests/code_booz.py

@@ -0,0 +1,65 @@
+from avrs.requests.request import AvrsApiRequest
+from argparse import RawTextHelpFormatter
+
+class AvrsCodeBoozRequest():
+    def __init__(self, parent_parser, cfg):
+        psr = parent_parser.add_parser(
+            'lwi', 
+            help='light-weight interface logging options\n\n')
+        sps = psr.add_subparsers(required=True, help='light-wieght interface logging options')
+
+        AvrsCodeBoozStartLogging(sps, cfg)
+        AvrsCodeBoozStopLogging(sps, cfg)
+        AvrsCodeBoozGetTimes(sps, cfg)
+
+class AvrsCodeBoozStartLogging(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'CodeBoozLog', 'Ego')
+        psr = parser.add_parser(
+            'start-log', help='starts logging', formatter_class=RawTextHelpFormatter)
+
+        psr.add_argument(
+            'out_file', 
+            help='the name of the log file to create (within the \"Saved\" directory)')
+
+        psr.add_argument(
+            '--format', choices=('binary', 'csv'), default='binary', help='the format to save logged data')
+
+        psr.add_argument(
+            '--rate-hz', type=float, default=100.0, help='the rate in hz to log data')
+
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_body(self, args):
+        return {
+            'Action': 'Start',
+            'FileName': args.out_file,
+            'RateHz': args.rate_hz,
+            'Format': args.format
+        }
+
+class AvrsCodeBoozStopLogging(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'CodeBoozLog', 'Ego')
+        psr = parser.add_parser(
+            'stop-log', help='starts logging', formatter_class=RawTextHelpFormatter)
+
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_body(self, args):
+        return {
+            'Action': 'Stop'
+        }
+
+class AvrsCodeBoozGetTimes(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'CodeBoozLog', 'Ego')
+        psr = parser.add_parser(
+            'get-times', help='starts logging', formatter_class=RawTextHelpFormatter)
+
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_body(self, args):
+        return {
+            'Action': 'GetTimes'
+        }

autoverse_cli-0.4.0/src/avrs/requests/edit_environment.py

@@ -0,0 +1,21 @@
+from avrs.requests.request import AvrsApiRequest
+
+class AvrsEditEnvironmentRequests():
+    def __init__(self, parser, cfg):
+            psr = parser.add_parser('edit-environment', help='Edits the environment')
+            sps = psr.add_subparsers(required= True, help='')
+            AvrsSetTimeOfDayRequest(sps, cfg)
+
+
+class AvrsSetTimeOfDayRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'SetTimeOfDay', '')
+        psr = parser.add_parser('set-time-of-day', help='sets the current time of day')
+        psr.add_argument('tod', type=float, help='The time of day (0-24) to set')
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_body(self, args):
+        self.target_object_id = ''
+        return {
+            'TimeOfDay': args.tod
+        }

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/requests/request.py

@@ -35,7 +35,7 @@ class AvrsApiRequest:
         # print('{}'.format(response))
 
     def send_http_request(self, args):
-        connection = http.client.HTTPConnection("localhost", 30313, timeout=2)
+        connection = http.client.HTTPConnection("localhost", 30313, timeout=10)
         headers = {'Content-type': 'application/json'}
         body = json.dumps(self.get_request(args)).encode('utf-8')
         connection.request('POST', '/post', body, headers)

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/requests/reserve_mv_slot.py

@@ -1,4 +1,5 @@
 from avrs.requests.request import AvrsApiRequest
+from argparse import RawTextHelpFormatter
 
 RESERVE_MV_SLOT_HELP = '''
 slot (if an open slot exists, there are 4 total) using the given name to add a new vehicle and the appropriate topics.
@@ -19,7 +20,7 @@ MV_LANDMARKS = [
 class ReserveMvSlot(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'SpawnObject', 0)
-        psr = parser.add_parser('reserve-mv-slot', help=RESERVE_MV_SLOT_HELP)
+        psr = parser.add_parser('reserve-mv-slot', help=RESERVE_MV_SLOT_HELP, formatter_class=RawTextHelpFormatter)
 
         psr.add_argument(
             'slot_name',

{autoverse_cli-0.2.2 → autoverse_cli-0.4.0}/src/avrs/requests/teleport.py

@@ -2,7 +2,7 @@ from avrs.requests.request import AvrsApiRequest
 
 class Teleport(AvrsApiRequest):
     def __init__(self, parser, cfg):
-        AvrsApiRequest.__init__(self, parser, cfg, 'Teleport', "Car1")
+        AvrsApiRequest.__init__(self, parser, cfg, 'Teleport', "Ego")
         psr = parser.add_parser('teleport', help='Teleports the car to the given x,y,z in either enu or lla.')
         psr.add_argument('x', type=float, help='new x position')
         psr.add_argument('y', type=float, help='new y position')

autoverse_cli-0.4.0/src/avrs/requests/vd.py

@@ -0,0 +1,36 @@
+from avrs.requests.request import AvrsApiRequest
+
+class Vd():
+    def __init__(self, parser, cfg):
+        psr = parser.add_parser('vd', help='Vehicle dynamic options')
+        sps = psr.add_subparsers(required= True, help='sub-command of vd')
+        SetFrictionModifier(sps, cfg)
+        #SlipModel(sps, cfg)
+
+class SetFrictionModifier(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'SetFrictionModifiers', 'Ego')
+        psr = parser.add_parser('set-friction-modifier', help='Change the amount of grip the car has.' 
+            + '0 is no grip and higher values will prevent spinning')
+        psr.add_argument('modifier', type = float, help = "Modified grip value")
+        psr.add_argument('tires', help = "Tires to apply the modifier to", 
+            choices=("FL", "FR", "RL", "RR", "F", "R", "All"))
+        psr.set_defaults(func=self.send_request)
+    
+    def get_request_body(self, args):
+        return {
+            'NewModifier': args.modifier,
+            'Tires': args.tires
+        }
+    
+# class SlipModel(AvrsApiRequest):
+#     def __init__(self, parser, cfg):
+#         AvrsApiRequest.__init__(self, parser, cfg, 'SlipModel', 'Ego')
+#         psr = parser.add_parser('slip-model', help='Change the tire slip model to be pure slip only or combined slip')
+#         psr.add_argument('slip', choices = ['pure-slip, combined-slip'], help = 'type of slip')
+#         psr.set_defaults(func=self.send_request)
+    
+#     def get_request_body(self, args):
+#         return {
+#             'Modifier Value': args.slip
+#         }

autoverse_cli-0.2.2/src/avrs/requests/vd.py

@@ -1,33 +0,0 @@
-from avrs.requests.request import AvrsApiRequest
-
-class Vd():
-    def __init__(self, parser, cfg):
-        psr = parser.add_parser('vd', help='Vehicle dynamic options')
-        sps = psr.add_subparsers(required= True, help='sub-command of vd')
-        SetFrictionModifier(sps, cfg)
-        SlipModel(sps, cfg)
-
-class SetFrictionModifier(AvrsApiRequest):
-    def __init__(self, parser, cfg):
-        AvrsApiRequest.__init__(self, parser, cfg, 'SetFrictionModifiers', 0)
-        psr = parser.add_parser('set-friction-modifier', help='Change the amount of grip the car has.' 
-            + '0 is no grip and higher values will prevent spinning')
-        psr.add_argument('modifier-value', type = float, help = "Modified grip value")
-        psr.set_defaults(func=self.send_request)
-    
-    def get_request_body(self, args):
-        return {
-            'Modifier Value': args.modifier-value
-        }
-    
-class SlipModel(AvrsApiRequest):
-    def __init__(self, parser, cfg):
-        AvrsApiRequest.__init__(self, parser, cfg, 'SlipModel', 0)
-        psr = parser.add_parser('slip-model', help='Change the tire slip model to be pure slip only or combined slip')
-        psr.add_argument('slip', choices = ['pure-slip, combined-slip'], help = 'type of slip')
-        psr.set_defaults(func=self.send_request)
-    
-    def get_request_body(self, args):
-        return {
-            'Modifier Value': args.slip
-        }