Update base.py

nullptr/analyzer.py

@@ -1,6 +1,7 @@
 from nullptr.models.marketplace import Marketplace
 from nullptr.models.jumpgate import Jumpgate
 from nullptr.models.system import System
+from nullptr.models.waypoint import Waypoint
 from dataclasses import dataclass
 
 @dataclass
@@ -29,14 +30,42 @@ class Analyzer:
 
   def find_markets(self, resource, sellbuy):
     for m in self.store.all(Marketplace):
-      resources = m.imports if sellbuy == 'sell' else m.exports
-      if resource in resources:
-        yield m
+      if 'sell' in sellbuy and resource in m.imports:
+        yield ('sell', m)
+      
+      elif 'buy' in sellbuy and resource in m.exports:
+        yield ('buy', m)
+      
+      elif 'exchange' in sellbuy and resource in m.exchange:
+        yield ('exchange', m)
+        
+  def find_closest_markets(self, resource, sellbuy, location):
+    if type(location) == str:
+      location = self.store.get(Waypoint, location)
+    mkts = self.find_markets(resource, sellbuy)
+    candidates = []
+    origin = self.store.get(System, location.system())
+    for typ, m in mkts:
+      system = self.store.get(System, m.system())
+      d = origin.distance(system)
+      candidates.append((typ, m, d))
+    possibles = sorted(candidates, key=lambda m: m[2])
+    possibles = possibles[:10]
+    results = []
+    for typ,m,d in possibles:
+      system = self.store.get(System, m.system())
+      p = self.find_path(origin, system)
+      if p is None: continue
+      results.append((typ,m,d,len(p)))
+    return results
+    
+  def solve_tsp(self, waypoints):
+    # todo actually try to solve it
+    return waypoints
  
   def get_jumpgate(self, system):
     gates = self.store.all_members(system, Jumpgate)
     return next(gates, None)
-
    
   def find_path(self, orig, to, depth=100, seen=None):
     if depth < 1: return None

nullptr/api.py

@@ -31,7 +31,7 @@ class Api:
   def request(self, method, path, data=None, need_token=True, params={}):
     try:
       return self.request_once(method, path, data, need_token, params)
-    except ApiLimitError:
+    except (ApiLimitError, requests.exceptions.Timeout):
       print('oops, hit the limit. take a break')
       sleep(10)
       return self.request_once(method, path, data, need_token, params)
@@ -121,7 +121,7 @@ class Api:
       'tradeSymbol': typ.upper(),
       'units': units
     }
-    data = self.request('post', f'my/contracts/{contract}/deliver', data)
+    data = self.request('post', f'my/contracts/{contract.symbol.lower()}/deliver', data)
     if 'cargo' in data:
       ship.update(data)
     if 'contract' in data:
@@ -129,7 +129,7 @@ class Api:
     return contract
   
   def fulfill(self, contract):
-    data = self.request('post', f'my/contracts/{contract}/fulfill')
+    data = self.request('post', f'my/contracts/{contract.symbol.lower()}/fulfill')
     if 'contract' in data:
       contract.update(data['contract'])
     if 'agent' in data:
@@ -221,8 +221,10 @@ class Api:
       return ship
     
   def jump(self, ship, system):
+    if type(system) == System:
+      system = system.symbol
     data = {
-      "systemSymbol": system.symbol
+      "systemSymbol": system
     }
     data = self.request('post', f'my/ships/{ship}/jump', data)
     if 'nav' in data:
@@ -244,11 +246,11 @@ class Api:
       else:
         raise e
     ship.update(data)
-    return ship
+    return data
   
   def survey(self, ship):
     data =  self.request('post', f'my/ships/{ship}/survey')
     ship.update(data)
     result = self.store.update_list('Survey', mg(data, 'surveys'))
     return result
-    
+    

nullptr/central_command.py

@@ -1,13 +1,18 @@
-from nullptr.store import store
+from nullptr.store import Store
 from nullptr.models.ship import Ship
-from nullptr.mission import *
+from nullptr.missions import create_mission, get_mission_class
 from random import choice
 from time import sleep
+from threading import Thread
 
+class CentralCommandError(Exception):
+  pass
+  
 class CentralCommand:
-  def __init__(self, api):
+  def __init__(self, store, api):
     self.missions = {}
     self.stopping = False
+    self.store = store
     self.api = api
     self.update_missions()
   
@@ -20,16 +25,36 @@ class CentralCommand:
     
   def tick(self):
     missions = self.get_ready_missions()
-    if len(missions) == 0: return
+    if len(missions) == 0: return False
     ship = choice(missions)
     mission = self.missions[ship]
     mission.step()
-
+    return True
+  
+  def wait_for_stop(self):
+    try:
+      input()
+    except EOFError:
+      pass
+    self.stopping = True
+    print('stopping...')
+    
+  def run_interactive(self):
+    print('auto mode. hit enter to stop')
+    t = Thread(target=self.wait_for_stop)
+    t.daemon = True
+    t.start()
+    self.run()
+    print('manual mode')
+    
   def run(self):
     self.update_missions()
     while not self.stopping:
-      self.tick()
-      self.api.save()
+      did_step = True
+      request_counter = self.api.requests_sent
+      while request_counter == self.api.requests_sent and did_step:
+        did_step = self.tick()
+      self.store.flush()
       sleep(0.5)
     self.stopping = False
       
@@ -47,24 +72,41 @@ class CentralCommand:
       return
     param = params[nm]
     try:
-      parsed_val = param.parse(val)
+      parsed_val = param.parse(val, self.store)
     except ValueError as e:
-      print(e)
+      raise MissionError(e)
       return
-    print('ok')
-    ship.mission_state[nm] = parsed_val
+    ship.set_mission_state(nm, parsed_val)
     
   def update_missions(self):
-    for s in store.all(Ship):
+    for s in self.store.all(Ship):
       if s.mission is None:
         if s in self.missions:
           self.stop_mission(s)
       elif s not in self.missions:
         self.start_mission(s)
+      if s in self.missions:
+        m = self.missions[s]
+        m.next_step = max(s.cooldown, s.arrival)
   
+  def init_mission(self, s, mtyp):
+    if mtyp == 'none':
+      s.mission_state = {}
+      s.mission_status = None
+      s.mission = None
+      return
+    try:
+      mclass = get_mission_class(mtyp)
+    except ValueError:
+      raise CentralCommandError('no such mission')
+    s.mission = mtyp
+    s.mission_status = 'init'
+    s.mission_state = {k: v.default for k,v in mclass.params().items()}
+    self.start_mission(s)
+    
   def start_mission(self, s):
     mtype = s.mission
-    m = create_mission(mtype, s, self.api)
+    m = create_mission(mtype, s, self.store, self.api)
     self.missions[s] = m
     return m
     

nullptr/command_line.py

@@ -41,7 +41,7 @@ class CommandLine:
     print(f'command not found; {c}')
   
   def handle_error(self, cmd, args, e):
-    logging.error(e, exc_info=type(e).__name__ not in ['ApiError','CommandError'])
+    logging.error(e, exc_info=type(e).__name__ not in ['ApiError','CommandError', 'CentralCommandError'])
   
   def handle_empty(self):
     pass
@@ -90,5 +90,8 @@ class CommandLine:
       except EOFError:
         self.handle_eof()
         break
-      self.handle_cmd(c)
+      try:
+        self.handle_cmd(c)
+      except Exception as e:
+        logging.error(e, exc_info=True)
       

nullptr/commander.py

@@ -12,7 +12,7 @@ from .util import *
 from time import sleep, time
 from threading import Thread
 from nullptr.atlas_builder import  AtlasBuilder
-
+from nullptr.central_command import CentralCommand
 class CommandError(Exception):
   pass
   
@@ -24,6 +24,7 @@ class Commander(CommandLine):
     self.agent = self.select_agent()
     self.api = Api(self.store, self.agent)
     self.atlas_builder = AtlasBuilder(self.store, self.api)
+    self.centcom = CentralCommand(self.store, self.api)
     self.analyzer = Analyzer(self.store)
     self.ship = None
     
@@ -45,7 +46,7 @@ class Commander(CommandLine):
   def ask_obj(self, typ, prompt):
     obj = None
     while obj is None:
-      symbol = input(prompt)
+      symbol = input(prompt).strip()
       obj = self.store.get(typ, symbol.upper())
       if obj is None:
         print('not found')
@@ -77,10 +78,101 @@ class Commander(CommandLine):
       self.api.info()
     
     pprint(self.agent, 100)
+  
+  def do_auto(self):
+    self.centcom.run_interactive()
+  
+  def print_mission(self):
+    print(f'mission: {self.ship.mission} ({self.ship.mission_status})')
+    pprint(self.ship.mission_state)
+    
+  def do_mission(self, arg=''):
+    if not self.has_ship(): return 
+    if arg:
+      self.centcom.init_mission(self.ship, arg)
+    self.print_mission()
+  
+  def do_mreset(self):
+    if not self.has_ship(): return 
+    self.ship.mission_state = {}
+    
+  def do_mset(self, nm, val):
+    if not self.has_ship(): return
+    self.centcom.set_mission_param(self.ship, nm, val)
+  
+  def active_contract(self):
+    for c in self.store.all('Contract'):
+      if c.accepted and not c.fulfilled: return c
+    raise CommandError('no active contract')
+    
+  def do_cmine(self):
+    if not self.has_ship(): return 
+    site = self.ship.location_str
+    contract = self.active_contract()
+    delivery = contract.unfinished_delivery()
+    if delivery is None:
+      raise CommandError('no delivery')
+    resource = delivery['trade_symbol']
+    destination = delivery['destination']
+    self.centcom.init_mission(self.ship, 'mine')
+    self.centcom.set_mission_param(self.ship, 'site', site)
+    self.centcom.set_mission_param(self.ship, 'resource', resource)
+    self.centcom.set_mission_param(self.ship, 'dest', destination)
+    self.centcom.set_mission_param(self.ship, 'contract', contract.symbol)
+    self.print_mission()
+  
+  def do_chaul(self):
+    if not self.has_ship(): return     
+    contract = self.active_contract()
+    delivery = contract.unfinished_delivery()
+    if delivery is None:
+      raise CommandError('no delivery')
+    resource = delivery['trade_symbol']
+    destination = delivery['destination']
+    m = self.analyzer.find_closest_markets(resource, 'buy', destination)
+    if len(m) == 0:
+      m = self.analyzer.find_closest_markets(resource, 'exchange', destination)
+    if len(m) == 0:
+      print('no market found')
+      return
+    _, m, _, _ = m[0]
+    site = self.store.get(Waypoint, m.symbol)
+    self.centcom.init_mission(self.ship, 'haul')
+    self.centcom.set_mission_param(self.ship, 'site', site.symbol)
+    self.centcom.set_mission_param(self.ship, 'resource', resource)
+    self.centcom.set_mission_param(self.ship, 'dest', destination)
+    self.centcom.set_mission_param(self.ship, 'contract', contract.symbol)
+    self.print_mission()
+  
+  def do_cprobe(self):
+    if not self.has_ship(): return     
+    contract = self.active_contract()
+    delivery = contract.unfinished_delivery()
+    if delivery is None:
+      raise CommandError('no delivery')
+    resource = delivery['trade_symbol']
+    destination = delivery['destination']
+    m = self.analyzer.find_closest_markets(resource, 'buy,exchange', destination)
+    if len(m) is None:
+      print('no market found')
+      return
+    markets = [ mkt[1] for mkt in m]
+    markets = self.analyzer.solve_tsp(markets)
+    hops = ','.join([m.symbol for m in markets])
+    self.centcom.init_mission(self.ship, 'probe')
+    self.centcom.set_mission_param(self.ship, 'hops', hops)
+    self.print_mission()
+  
+  def do_travel(self, dest):
+    dest = self.resolve('Waypoint', dest)
+    self.centcom.init_mission(self.ship, 'travel')
+    self.centcom.set_mission_param(self.ship, 'dest', dest.symbol)
+    self.print_mission()
     
   def do_register(self, faction):
     self.api.register(faction.upper())
-  
+    pprint(self.api.agent)
+    
   def do_universe(self, page=1):
     self.atlas_builder.run(page)
   
@@ -88,7 +180,15 @@ class Commander(CommandLine):
     r = self.api.list_systems(int(page))
     pprint(self.api.last_meta)
   
-  
+  def do_stats(self):
+    total = 0
+    for t in self.store.data:
+      num = len(self.store.data[t])
+      nam = t.__name__
+      total += num
+      print(f'{num:5d} {nam}')
+    print(f'{total:5d} total')
+    
   def do_waypoints(self, system_str=''):
     if system_str == '':
       if not self.has_ship(): return
@@ -124,16 +224,16 @@ class Commander(CommandLine):
     r = self.api.jumps(waypoint)
     pprint(r)
   
-  def do_query(self):
-    location = self.ask_obj(System, 'Where are you? ')
-    resource = input('what resource?').upper()
-    sellbuy = self.ask_multichoice(['sell','buy'], 'do you want to sell or buy?')
+  def do_query(self, resource):
+    if not self.has_ship(): return
+    location = self.ship.location()
+    resource = resource.upper()
     print('Found markets:')
-    for m in self.analyzer.find_markets(resource, sellbuy):
-      system = self.store.get(System, m.system())
-      p = self.analyzer.find_path(location, system)
-      if p is None: continue
-      print(m, f'{len(p)-1} hops')
+    for typ, m, d, plen in self.analyzer.find_closest_markets(resource, 'buy,exchange',location):
+      price = '?'
+      if resource in m.prices:
+        price = m.prices[resource]['buy']
+      print(m, typ[0], f'{plen-1:3} hops {price}')
       
   def do_path(self):
     orig = self.ask_obj(System, 'from: ')
@@ -156,6 +256,21 @@ class Commander(CommandLine):
     else:
       r = list(self.store.all('Contract'))
     pprint(r)
+  
+  def do_deliver(self):
+    if not self.has_ship(): return 
+    site = self.ship.location_str
+    contract = self.active_contract()
+    delivery = contract.unfinished_delivery()
+    if delivery is None:
+      raise CommandError('no delivery')
+    resource = delivery['trade_symbol']
+    self.api.deliver(self.ship, resource, contract)
+    pprint(contract)
+  
+  def do_fulfill(self):
+    contract = self.active_contract()
+    self.api.fulfill(contract)
     
   def do_ship(self, arg=''):
     if arg != '':
@@ -238,7 +353,9 @@ class Commander(CommandLine):
   def do_shipyard(self):
     if not self.has_ship(): return
     location = self.ship.location()
-    pprint(self.api.shipyard(location))
+    data = self.api.shipyard(location)
+    for s in must_get(data, 'ships'):
+      print(s['type'], s['purchasePrice'])
   
   def do_jump(self, system_str):
     if not self.has_ship(): return
@@ -261,4 +378,18 @@ class Commander(CommandLine):
   def do_survey(self):
     if not self.has_ship(): return
     r = self.api.survey(self.ship)
-    pprint(r)
+    pprint(r)
+  
+  def do_surveys(self):
+    pprint(list(self.store.all('Survey')))
+  
+  def do_extract(self, survey_str=''):
+    if not self.has_ship(): return
+    survey = None
+    if survey_str != '':
+      survey = self.resolve('Survey', survey_str)
+    result = self.api.extract(self.ship, survey)
+    
+    symbol = mg(result,'extraction.yield.symbol')
+    units  = mg(result,'extraction.yield.units')
+    print(units, symbol)

nullptr/missions/__init__.py

@@ -0,0 +1,23 @@
+from nullptr.missions.survey import SurveyMission
+from nullptr.missions.mine import MiningMission
+from nullptr.missions.haul import HaulMission
+from nullptr.missions.travel import TravelMission
+from nullptr.missions.probe import ProbeMission
+
+def get_mission_class( mtype):
+  types = {
+    'survey': SurveyMission,
+    'mine': MiningMission,
+    'haul': HaulMission,
+    'travel': TravelMission,
+    'probe': ProbeMission
+  }
+  if mtype not in types:
+    raise ValueError(f'invalid mission type {mtype}')
+  return types[mtype]
+  
+def create_mission(mtype, ship, store, api):
+  typ = get_mission_class(mtype)
+  m = typ(ship, store, api)
+  return m
+

nullptr/missions/base.py

@@ -1,48 +1,63 @@
-from nullptr.store import store
+from nullptr.store import Store
+from nullptr.models.base import Base
 from nullptr.models.waypoint import Waypoint
 from nullptr.models.contract import Contract
+from nullptr.models.system import System
 from nullptr.models.survey import Survey
 from nullptr.models.ship import Ship
+from nullptr.analyzer import Analyzer
 from time import time
+from functools import partial
 import logging
-from util import *
+from nullptr.util import *
 
+class MissionError(Exception):
+  pass
+  
 class MissionParam:
   def __init__(self, cls, required=True, default=None):
     self.cls = cls
     self.required = required
     self.default = default
   
-  def parse(self, val):
+  def parse(self, val, store):
     if self.cls == str:
       return str(val)
     elif self.cls == int:
       return int(val)
-    elif issubclass(self.cls, StoreObject):
+    elif self.cls == list:
+      return [i.strip() for i in val.split(',')]
+    elif issubclass(self.cls, Base):
       data = store.get(self.cls, val)
       if data is None:
         raise ValueError('object not found')
-      return data
+      return data.symbol
     else:
       raise ValueError('unknown param typr')
     
 class Mission:
-  ship: Ship
-  next_step: int = 0
-  
   @classmethod
   def params(cls):
     return {
       
     }
   
-  def __init__(self, ship, api):
+  def __init__(self, ship, store, api):
     self.ship = ship
+    self.store = store
     self.api = api
+    self.next_step = 0
+    self.analyzer = Analyzer(self.store)
 
   def sts(self, nm, v):
-    self.ship.mission_state[nm] = v
+    if issubclass(type(v), Base):
+      v = v.symbol
+    self.ship.set_mission_state(nm, v)
   
+  def rst(self, typ, nm):
+    symbol = self.st(nm)
+    return self.store.get(typ, symbol)
+    
   def st(self, nm):
     if not nm in self.ship.mission_state:
       return None
@@ -98,7 +113,7 @@ class Mission:
     try:
       result = handler()
     except Exception as e:
-      logging.error(e)
+      logging.error(e, exc_info=True)
       self.status('error')
       return
     if type(next_step) == str:
@@ -112,97 +127,23 @@ class Mission:
         self.status(next_step[result])
     print(f'{self.ship} {status} -> {self.status()}')
 
-
-class MiningMission(Mission): 
-  @classmethod
-  def params(cls):
-    return {
-      'site': MissionParam(Waypoint, True),
-      'resource': MissionParam(str, True),
-      'destination': MissionParam(Waypoint, True),
-      'delivery': MissionParam(str, True, 'deliver'),
-      'contract': MissionParam(Contract, False)
-    }
-  
-  def start_state(self):
-    return 'go_site'
-    
-  def steps(self):
-    return {
-      'extract': (self.step_extract, {
-        'done': 'dock',
-        'more': 'extract'
-      }),
-      'dock': (self.step_dock, 'sell'),
-      'sell': (self.step_sell, {
-        'more': 'sell',
-        'done': 'orbit',
-      }),
-      'orbit': (self.step_orbit, 'jettison'),
-      'jettison': (self.step_dispose, {
-        'more': 'jettison',
-        'done': 'extract',
-        'full': 'go_dest'
-      }),
-      'go_dest': (self.step_go_dest, 'dock_dest'),
-      'dock_dest': (self.step_dock, 'unload'),
-      'unload': (self.step_unload, {
-        'done': 'refuel',
-        'more': 'unload'
-      }),
-      'refuel': (self.step_refuel, 'orbit_dest'),
-      'orbit_dest': (self.step_orbit, 'go_site'),
-      'go_site': (self.step_go_site, 'extract')
-    }
-  
-  def get_survey(self):
-    resource = self.st('resource')
-    site = self.st('site')
-    # todo optimize
-    for s in store.all(Survey):
-      if resource in s.deposits and site == s.waypoint:
-        return s
-    return None
-    
-  def step_extract(self):
-    survey = self.get_survey()
-    print('using survey:', str(survey)) 
-    result = self.api.extract(self.ship, survey)
-    symbol = sg(result,'extraction.yield.symbol')
-    units  = sg(result,'extraction.yield.units')
-    print('extracted:', units, symbol)
-    self.next_step = self.ship.cooldown
-    if self.ship.cargo_units < self.ship.cargo_capacity:
-      return 'more'
-    else:
-      return 'done'
-    
-  def step_sell(self, except_resource=True):
-    target = self.st('resource')
-    market = self.api.market(self.ship.location)
-    sellables = market.sellable_items(self.ship.cargo.keys())
-    if target in sellables and except_resource:
-      sellables.remove(target)
-    if len(sellables) == 0:
-      return 'done'
-    self.api.sell(self.ship, sellables[0])
-    if len(sellables) == 1:
-      return 'done'
-    else:
-      return 'more'
-      
+class BaseMission(Mission):
   def step_go_dest(self):
-    destination = self.st('destination')
-    if self.ship.location == destination:
+    destination = self.rst(Waypoint, 'destination')
+    if self.ship.location() == destination:
       return
     self.api.navigate(self.ship, destination)
     self.next_step = self.ship.arrival
-
-  def step_dock(self):
-    self.api.dock(self.ship)
-
+  
+  def step_go_site(self):
+    site = self.rst(Waypoint,'site')
+    if self.ship.location() == site:
+      return
+    self.api.navigate(self.ship, site)
+    self.next_step = self.ship.arrival
+    
   def step_unload(self):
-    contract = self.st('contract')
+    contract = self.rst(Contract, 'contract')
     delivery = self.st('delivery')
     if delivery == 'sell':
       return self.step_sell(False)
@@ -214,55 +155,96 @@ class MiningMission(Mission):
       return 'done'
     else:
       return 'more'
-  
-  def step_refuel(self):
-    self.api.refuel(self.ship)
-    
-  def step_dispose(self):
-    contract = self.st('contract')
-    typs = self.ship.nondeliverable_cargo(contract)
-    if len(typs) > 0:
-      self.api.jettison(self.ship, typs[0])
-    if len(typs) > 1:
-      return 'more'
-    elif self.ship.cargo_units > self.ship.cargo_capacity - 3:
-      return 'full'
-    else:
+
+  def step_sell(self, except_resource=True):
+    target = self.st('resource')
+    market = self.store.get('Marketplace', self.ship.location_str)
+    sellables = market.sellable_items(self.ship.cargo.keys())
+    if target in sellables and except_resource:
+      sellables.remove(target)
+    if len(sellables) == 0:
       return 'done'
+    self.api.sell(self.ship, sellables[0])
+    if len(sellables) == 1:
+      return 'done'
+    else:
+      return 'more'
   
+  def step_load(self):
+    cargo_space = self.ship.cargo_capacity - self.ship.cargo_units
+    resource = self.st('resource')
+    self.api.buy(self.ship, resource, cargo_space)
   
+  def step_travel(self):
+    traject = self.st('traject')
+    if traject is None or traject == []:
+      return 'done'
+    dest = self.store.get(Waypoint, traject[-1])
+    loc = self.ship.location()
+    print(dest, loc)
+    if dest == loc:
+      self.sts('traject', None)
+      return 'done'
+    hop = traject.pop(0)
+    if len(hop.split('-')) == 3:
+      self.api.navigate(self.ship, hop)
+      self.next_step = self.ship.arrival
+    else:
+      self.api.jump(self.ship, hop)
+      self.next_step = self.ship.cooldown
+    if traject == []:
+      traject= None
+    self.sts('traject', traject)
+    return 'more'
+  
+  def step_calculate_traject(self, dest):
+    if type(dest) == str:
+      dest = self.store.get(Waypoint, dest)
+    loc = self.ship.location()
+    loc_sys = self.store.get(System, loc.system())
+    loc_jg = self.analyzer.get_jumpgate(loc_sys)
+    dest_sys = self.store.get(System, dest.system())
+    dest_jg = self.analyzer.get_jumpgate(dest_sys)
+    if dest_sys == loc_sys:
+      result = [dest.symbol]
+      self.sts('traject', result)
+      return
+    path = self.analyzer.find_path(loc_sys, dest_sys)
+    result = []
+    if loc.symbol != loc_jg.symbol:
+      result.append(loc_jg.symbol)
+    result += [s.symbol for s in path[1:]]
+    if dest_jg.symbol != dest.symbol:
+      result.append(dest.symbol)
+    self.sts('traject', result)
+    print(result)
+    return result
+    
+  def step_dock(self):
+    self.api.dock(self.ship)
+ 
+  def step_refuel(self):
+    if self.ship.fuel_capacity == 0:
+      return
+    if self.ship.fuel_current / self.ship.fuel_capacity < 0.5:
+      try:
+        self.api.refuel(self.ship)
+      except Exception as e:
+        pass
+       
   def step_orbit(self):
     self.api.orbit(self.ship)
-
-  def step_go_site(self):
-    site = self.st('site')
-    if self.ship.location == site:
-      return
-    self.api.navigate(self.ship, site)
-    self.next_step = self.ship.arrival
-    
-class SurveyMission(Mission):
-  def start_state(self):
-    return 'survey'
   
-    
-  def steps(self):
+  def travel_steps(self, nm, destination, next_step):
+    destination = self.st(destination)
+    calc = partial(self.step_calculate_traject, destination)
     return {
-      'survey': (self.step_survey, 'survey')
+      f'travel-{nm}': (self.step_orbit, f'calc-trav-{nm}'),
+      f'calc-trav-{nm}': (calc, f'go-{nm}'),
+      f'go-{nm}': (self.step_travel, {
+        'done': f'dock-{nm}',
+        'more': f'go-{nm}'
+      }),
+      f'dock-{nm}': (self.step_dock, f'refuel-{nm}'),
+      f'refuel-{nm}': (self.step_refuel, next_step)
     }
-  
-  def step_survey(self):
-    result = self.api.survey(self.ship)
-    #pprint(result, 2)
-    self.next_step = self.ship.cooldown
-
-def create_mission(mtype, ship, api):
-  types = {
-    'survey': SurveyMission,
-    'mine': MiningMission
-  }
-  if mtype not in types:
-    logging.warning(f'invalid mission type {mtype}')
-    return
-  m = types[mtype](ship, api)
-  return m

nullptr/missions/haul.py

@@ -0,0 +1,25 @@
+from nullptr.missions.base import BaseMission, MissionParam
+from nullptr.models.waypoint import Waypoint
+from nullptr.models.survey import Survey
+from nullptr.models.contract import Contract
+class HaulMission(BaseMission):
+  def start_state(self):
+    return 'travel-to'
+  
+  @classmethod
+  def params(cls):
+    return {
+      'site': MissionParam(Waypoint, True),
+      'resource': MissionParam(str, True),
+      'dest': MissionParam(Waypoint, True),
+      'delivery': MissionParam(str, True, 'deliver'),
+      'contract': MissionParam(Contract, False)
+    }
+  
+  def steps(self):
+    return {
+      **self.travel_steps('to', 'site', 'load'),
+      'load': (self.step_load, 'travel-back'),
+      **self.travel_steps('back', 'dest', 'unload'),
+      'unload': (self.step_unload, 'travel-to'),
+    }

nullptr/missions/mine.py

@@ -0,0 +1,80 @@
+from nullptr.missions.base import BaseMission, MissionParam
+from nullptr.models.waypoint import Waypoint
+from nullptr.models.survey import Survey
+from nullptr.models.contract import Contract
+from nullptr.util import *
+
+class MiningMission(BaseMission): 
+  @classmethod
+  def params(cls):
+    return {
+      'site': MissionParam(Waypoint, True),
+      'resource': MissionParam(str, True),
+      'dest': MissionParam(Waypoint, True),
+      'delivery': MissionParam(str, True, 'deliver'),
+      'contract': MissionParam(Contract, False)
+    }
+  
+  def start_state(self):
+    return 'travel-to'
+    
+  def steps(self):
+    return {
+      **self.travel_steps('to', 'site', 'orbit1'),
+      'orbit1': (self.step_orbit, 'extract'),
+      'extract': (self.step_extract, {
+        'done': 'dock',
+        'more': 'extract'
+      }),
+      'dock': (self.step_dock, 'sell'),
+      'sell': (self.step_sell, {
+        'more': 'sell',
+        'done': 'orbit2',
+      }),
+      'orbit2': (self.step_orbit, 'jettison'),
+      'jettison': (self.step_dispose, {
+        'more': 'jettison',
+        'done': 'extract',
+        'full': 'travel-back'
+      }),
+      **self.travel_steps('back', 'dest', 'unload'),
+      'unload': (self.step_unload, {
+        'done': 'travel-to',
+        'more': 'unload'
+      }),
+    }
+  
+  def get_survey(self):
+    resource = self.st('resource')
+    site = self.rst(Waypoint,'site')
+    # todo optimize
+    for s in self.store.all(Survey):
+      if resource in s.deposits and site.symbol == s.waypoint():
+        return s
+    return None
+    
+  def step_extract(self):
+    survey = self.get_survey()
+    print('using survey:', str(survey)) 
+    result = self.api.extract(self.ship, survey)
+    symbol = sg(result,'extraction.yield.symbol')
+    units  = sg(result,'extraction.yield.units')
+    print('extracted:', units, symbol)
+    self.next_step = self.ship.cooldown
+    if self.ship.cargo_units < self.ship.cargo_capacity:
+      return 'more'
+    else:
+      return 'done'
+  
+  def step_dispose(self):
+    contract = self.rst(Contract, 'contract')
+    typs = self.ship.nondeliverable_cargo(contract)
+    if len(typs) > 0:
+      self.api.jettison(self.ship, typs[0])
+    if len(typs) > 1:
+      return 'more'
+    elif self.ship.cargo_units > self.ship.cargo_capacity - 3:
+      return 'full'
+    else:
+      return 'done'
+  

nullptr/missions/probe.py

@@ -0,0 +1,33 @@
+from nullptr.missions.base import BaseMission, MissionParam
+from nullptr.models.waypoint import Waypoint
+
+class ProbeMission(BaseMission):
+  def start_state(self):
+    return 'next-hop'
+  
+  @classmethod
+  def params(cls):
+    return {
+      'hops': MissionParam(list, True),
+      'next-hop': MissionParam(int, True, 0)
+    }
+  
+  def steps(self):
+    return {
+      'next-hop': (self.step_next_hop, 'travel-to'),
+      **self.travel_steps('to', 'site', 'market'),
+      'market': (self.step_market, 'next-hop'),
+ 
+    }
+  
+  def step_market(self):
+    loc = self.ship.location()
+    self.api.marketplace(loc)
+  
+  def step_next_hop(self):
+    hops = self.st('hops')
+    next_hop = self.st('next-hop')
+    hop = hops[next_hop]
+    self.sts('site', hop)
+    self.sts('next-hop', (next_hop+1) % len(hops))
+    

nullptr/missions/survey.py

@@ -0,0 +1,15 @@
+from nullptr.missions.base import BaseMission, MissionParam
+
+class SurveyMission(BaseMission):
+  def start_state(self):
+    return 'survey'
+  
+  def steps(self):
+    return {
+      'survey': (self.step_survey, 'survey')
+    }
+  
+  def step_survey(self):
+    result = self.api.survey(self.ship)
+    #pprint(result, 2)
+    self.next_step = self.ship.cooldown

nullptr/missions/travel.py

@@ -0,0 +1,16 @@
+from nullptr.missions.base import BaseMission, MissionParam
+from nullptr.models.waypoint import Waypoint
+
+class TravelMission(BaseMission):
+  def start_state(self):
+    return 'travel-to'
+  
+  @classmethod
+  def params(cls):
+    return {
+      'dest': MissionParam(Waypoint, True)
+    }
+  
+  def steps(self):
+    return self.travel_steps('to', 'dest', 'done')
+    

nullptr/models/agent.py

@@ -1,8 +1,9 @@
 from .base import Base
 
 class Agent(Base):
-  token: str = None
-  credits: int = 0
+  def define(self):
+    self.token: str = None
+    self.credits: int = 0
   
   def update(self, d):
     self.seta('credits', d)

nullptr/models/base.py

@@ -1,17 +1,21 @@
 from copy import deepcopy
-from dataclasses import dataclass
 from nullptr.util import sg
 
-@dataclass
 class Base:
   identifier = 'symbol'
   symbol: str
   store: object
   
   def __init__(self, symbol, store):
+    self.disable_dirty = True
     self.store = store
     self.symbol = symbol
-  
+    self.define()
+    self.disable_dirty = False
+    
+  def define(self):
+    pass
+    
   def __hash__(self):
     return hash((str(type(self)), self.symbol))
   
@@ -34,15 +38,20 @@ class Base:
       setattr(self, attr, lst)
     
   def __setattr__(self, name, value):
-    if name not in ['symbol','store','__dict__']:
+    if name not in ['symbol','store','disable_dirty'] and not self.disable_dirty:
       self.store.dirty(self)
     super().__setattr__(name, value)
   
   def update(self, d):
     pass
   
+  def is_expired(self):
+    return False
+    
   def load(self, d):
-    self.__dict__ = d
+    self.disable_dirty = True
+    self.__dict__.update(d)
+    self.disable_dirty = False
     
   def dict(self):
     r = {}

nullptr/models/contract.py

@@ -5,13 +5,14 @@ from .base import Base
 
 class Contract(Base):
   identifier = 'id'
-  type: str
-  deliveries: list
-  accepted: bool
-  fulfilled: bool
-  expires: int
-  expires_str: str
-  pay: int
+  def define(self):
+    self.type: str = ''
+    self.deliveries: list = []
+    self.accepted: bool = False
+    self.fulfilled: bool = False
+    self.expires: int = 0
+    self.expires_str: str = ''
+    self.pay: int = 0
   
   @classmethod
   def ext(cls):
@@ -29,6 +30,18 @@ class Contract(Base):
       'expiration': self.expires_str,
     }
   
+  def is_done(self):
+    for d in self.deliveries:
+      if d['units_fulfilled'] > d['units_requires']:
+        return False
+    return False
+  
+  def unfinished_delivery(self):
+    for d in self.deliveries:
+      if d['units_required'] > d['units_fulfilled']:
+        return d
+    return None
+    
   def update(self, d):
     self.seta('expires',d, 'terms.deadline',parse_timestamp)
     self.seta('expires_str', d,'terms.deadline')
@@ -46,6 +59,7 @@ class Contract(Base):
       delivery['destination'] = must_get(e, 'destinationSymbol')
       self.deliveries.append(delivery)
 
+  
   def f(self, detail=1):
     hours = int(max(0, self.expires - time()) / 3600)
     accepted = 'A' if self.accepted else '-'

nullptr/models/jumpgate.py

@@ -2,9 +2,10 @@ from .system_member import SystemMember
 from dataclasses import field
 
 class Jumpgate(SystemMember):
-  range: int
-  faction: str
-  systems: list = []
+  def define(self):
+    self.range: int = 0
+    self.faction: str = ''
+    self.systems: list = []
   
   def update(self, d):
     self.setlst('systems', d, 'connectedSystems', 'symbol')

nullptr/models/marketplace.py

@@ -5,11 +5,12 @@ from nullptr.util import *
 from dataclasses import field
 
 class Marketplace(SystemMember):
-  imports:list = []
-  exports:list = []
-  exchange:list = []
-  prices:dict = {}
-  last_prices:int = 0
+  def define(self):
+    self.imports:list = []
+    self.exports:list = []
+    self.exchange:list = []
+    self.prices:dict = {}
+    self.last_prices:int = 0
   
   def update(self, d):
     self.setlst('imports', d, 'imports', 'symbol')
@@ -26,7 +27,10 @@ class Marketplace(SystemMember):
         price['sell'] = mg(g, 'sellPrice')
         prices[symbol] = price
       self.prices = prices
-      
+  
+  def sellable_items(self, resources):
+    return [r for r in resources if r in self.prices]
+    
   @classmethod
   def ext(self):
     return 'mkt'

nullptr/models/ship.py

@@ -4,18 +4,19 @@ from nullptr.util import *
 from dataclasses import dataclass, field
 
 class Ship(Base):  
-  cargo:dict = {}
-  mission_state:dict = {}
-  status:str = ''
-  cargo_capacity:int = 0
-  cargo_units:int = 0
-  location_str = ''
-  cooldown:int = 0
-  arrival:int = 0
-  fuel_current:int = 0
-  fuel_capacity:int = 0
-  mission:str = None
-  mission_status:str = 'init'
+  def define(self):
+    self.cargo:dict = {}
+    self.mission_state:dict = {}
+    self.status:str = ''
+    self.cargo_capacity:int = 0
+    self.cargo_units:int = 0
+    self.location_str = ''
+    self.cooldown:int = 0
+    self.arrival:int = 0
+    self.fuel_current:int = 0
+    self.fuel_capacity:int = 0
+    self.mission:str = None
+    self.mission_status:str = 'init'
   
   @classmethod
   def ext(self):
@@ -50,6 +51,10 @@ class Ship(Base):
   
   def is_travelling(self):
     return self.status == 'IN_TRANSIT'
+  
+  def set_mission_state(self, nm, val):
+    self.mission_state[nm] = val
+    self.store.dirty(self)
 
   def get_cargo(self, typ):
     if typ not in self.cargo:

nullptr/models/survey.py

@@ -6,12 +6,13 @@ size_names = ['SMALL','MODERATE','LARGE']
 
 class Survey(SystemMember):
   identifier = 'signature'
-  type: str = ''
-  deposits: list[str] = []
-  size: int = 0
-  expires: int = 0
-  expires_str: str = ''
-  exhausted: bool = False
+  def define(self):
+    self.type: str = ''
+    self.deposits: list[str] = []
+    self.size: int = 0
+    self.expires: int = 0
+    self.expires_str: str = ''
+    self.exhausted: bool = False
 
   @classmethod
   def ext(cls):
@@ -19,16 +20,20 @@ class Survey(SystemMember):
   
   def path(self):
     sector, system, waypoint, signature = self.symbol.split('-')
-    return f'atlas/{sector}/{system[0:1]}/{system}/{waypoint}-{signature}.{self.ext()}'
+    return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
     
   
   def is_expired(self):
     return time() > self.expires or self.exhausted
   
+  def waypoint(self):
+    p = self.symbol.split('-')
+    return '-'.join(p[:3])
+    
   def api_dict(self):
     return {
       'signature': self.symbol,
-      'symbol': str(self.waypoint),
+      'symbol': self.waypoint(),
       'deposits': [{'symbol': d} for d in self.deposits],
       'expiration': self.expires_str,
       'size': size_names[self.size]

nullptr/models/system.py

@@ -3,9 +3,10 @@ from .base import Base
 from math import sqrt
 
 class System(Base):
-  x:int = 0
-  y:int = 0
-  type:str = 'unknown'
+  def define(self):
+    self.x:int = 0
+    self.y:int = 0
+    self.type:str = 'unknown'
   
   def update(self, d):
     self.seta('x', d)

nullptr/models/waypoint.py

@@ -3,11 +3,12 @@ from nullptr.util import *
 from dataclasses import field
 
 class Waypoint(SystemMember):
-  x:int = 0
-  y:int = 0
-  type:str = 'unknown'
-  traits:list = []
-  faction:str = ''
+  def define(self):
+    self.x:int = 0
+    self.y:int = 0
+    self.type:str = 'unknown'
+    self.traits:list = []
+    self.faction:str = ''
   
   def update(self, d):
     self.seta('x', d)

nullptr/store.py

@@ -23,6 +23,8 @@ class Store:
     self.data = {m: {} for m in self.models}
     self.system_members = {}
     self.dirty_objects = set()
+    self.cleanup_interval = 600
+    self.last_cleanup = 0
   
   def init_models(self):
     self.models = all_subclasses(Base)
@@ -122,11 +124,30 @@ class Store:
   
     if system not in self.system_members:
       return 
+      print('typ', typ)
     for m in self.system_members[system]:
       if typ is None or type(m) == typ:
         yield m
+    
+  def cleanup(self):
+    if time() < self.last_cleanup + self.cleanup_interval:
+      return
+    start_time = time()
+    expired = list()
+    for t in self.data:
+      for o in self.all(t):
+        if o.is_expired():
+          expired.append(o)
+    for o in expired:
+      path = o.path()
+      if isfile(path):
+        os.remove(path)
+      del self.data[type(o)][o.symbol]
+    dur = time() - start_time
+    # print(f'cleaned {len(expired)} in {dur:.03f} seconds')
       
   def flush(self):
+    self.cleanup()
     it = 0
     start_time = time()
     for obj in self.dirty_objects: