@@ -739,42 +739,26 @@ def submit_observation(self, observation_payload) -> [()]:
739739 #for property in too_status_properties:
740740 # logger.debug(f'submit_observation - too.status.{property}: {getattr(self.swift_api.too.status, property)}')
741741
742+ too_id = None
742743 if self .swift_api .too .status .status == 'Accepted' :
744+ too_id = self .swift_api .too .status .too_id
743745 # this was a successful submission
744746 logger .info (f'submit_observation - too.status.status: { self .swift_api .too .status .status } ' )
745- logger .info (f'submit_observation - too.status. too_id: { self . swift_api . too . status . too_id } ' )
747+ logger .info (f'submit_observation - too_id: { too_id } ' )
746748
747749 # lets examine the TOO created
748- # TODO: move this code into swift_api.py
749750 # see https://www.swift.psu.edu/too_api/index.php?md=Swift TOO Request Example Notebook.ipynb
750751
751752 if self .swift_api .too .debug :
752753 # this was a debug submission and thus, no TOO was made and
753754 # the too_id returned in the too.status is points to nothing.
754- pass
755- logger .info ((f'submit_observation - DEBUG submission - too_id'
756- f' { self .swift_api .too .status .too_id } is not real.' ))
757- else :
758- # TODO: it's unclear if we really need to ask for the TOORequests object
759- # for this too at this point....
760-
761- # configure the request object
762- self .swift_api .too_request .username = self .swift_api .too .username
763- self .swift_api .too_request .shared_secret = self .swift_api .too .shared_secret
764- self .swift_api .too_request .detail = True
765- self .swift_api .too_request .too_id = self .swift_api .too .status .too_id
766- too_request_response = self .swift_api .too_request .submit ()
767-
768- if too_request_response :
769- logger .debug (f'submit_observation - too_request[0]: { self .swift_api .too_request [0 ]} ' )
770- else :
771- logger .error (f'submit_observation - too_request_response: { too_request_response } ' )
755+ logger .warning ((f'submit_observation - DEBUG submission - too_id: { too_id } is not real.' ))
772756 else :
773757 logger .error (f'submit_observation - too.status.status: { self .swift_api .too .status .status } ' )
774758
775759 # TODO: remove this -- it is only for debugging/development
776760 #self.swift_api.too.status.too_id = 19529 # an actual NCG1566 TOO
777761
778- return [self . swift_api . too . status . too_id ]
762+ return [too_id ]
779763
780764
0 commit comments