remove some broker references

Author: jchate6

docs/introduction/tomarchitecture.rst

@@ -275,8 +275,8 @@ A ``ReducedDatum`` is a single point of data associated with a ``Target`` and op
 spectrum. The ``ReducedDatum`` model has the following fields, in addition to its aforementioned
 foreign key relationships:
 
-- ``data_type`` is maintained on both the ``ReducedDatum`` and ``DataProduct`` for the case when data is brought in from another source, such as a broker
-- The ``source_name`` optionally refers to the original source of the data. The intent of this field was to track data ingested from brokers, but could potentially be used for other purposes.
+- ``data_type`` is maintained on both the ``ReducedDatum`` and ``DataProduct`` for the case when data is brought in from another source, such as an external data service.
+- The ``source_name`` optionally refers to the original source of the data. The intent of this field was to track data ingested from a dataservice, such as a broker, but could potentially be used for other purposes.
 - ``source_location`` optionally gives a hard location to the source--for a broker, it would be a link to the original alert.
 - The ``timestamp`` time at which the datum was produced.
 - ``value`` is a ``TextField`` that can take any series of data. As implemented, photometry is stored as JSON with keys for magnitude and error, but the ``TextField`` provides flexibility for additional photometry values on the datum. Spectroscopy is also stored as JSON, with keys for ``magnitude`` and ``flux``.

tom_dataproducts/management/commands/updatereduceddata.py

@@ -12,11 +12,13 @@
 
 
 class Command(BaseCommand):
-    help = 'Gets and updates time-series data for a target with data extracted from data services.'
+    help = 'Gets and updates time-series data for a target with data extracted from data services. This will search' \
+    'existing data for sources that match installed data services and check those data services for new data.'
 
     def add_arguments(self, parser):
         parser.add_argument(
             '--target_id',
+            help='ID of target for which you would like updated data. Leave blank to update all targets.'
         )
 
     def handle(self, *args, **options):
@@ -28,12 +30,16 @@ def handle(self, *args, **options):
         if options['target_id']:
             try:
                 target = Target.objects.get(pk=options['target_id'])
-                sources = [s.source_name for s in ReducedDatum.objects.filter(target=target).filter(source_name__in=dataservice_classes.keys()).distinct()]
+                sources = [s.source_name for s in ReducedDatum.objects.filter(target=target).filter(
+                    source_name__in=dataservice_classes.keys()).distinct()
+                    ]
                 targets = [target]
             except ObjectDoesNotExist:
                 raise Exception('Invalid target id provided')
         else:
-            sources = [s.source_name for s in ReducedDatum.objects.filter(source_name__in=dataservice_classes.keys()).distinct()]
+            sources = [s.source_name for s in ReducedDatum.objects.filter(
+                source_name__in=dataservice_classes.keys()).distinct()
+                ]
             targets = Target.objects.filter(
                 id__in=ReducedDatum.objects.filter(
                     source_name__in=sources

tom_dataproducts/models.py

@@ -350,8 +350,9 @@ class ReducedDatum(models.Model):
         DATA_PRODUCT_TYPES in settings.py.
     :type data_type: str
 
-    :param source_name: The original source of this datum. The current major use of this field is to track the broker a
-                        datum came from, but can be used for other sources.
+    :param source_name: The original source of this datum. The current major use of this field is to track the data
+                        service a datum came from, but can be used for other sources.
+
     :type source_name: str
 
     :param source_location: A reference to the location that this datum was originally sourced from. The current major

tom_dataproducts/views.py

@@ -498,8 +498,8 @@ def form_valid(self, form):
 
 class UpdateReducedDataView(LoginRequiredMixin, RedirectView):
     """
-    View that handles the updating of reduced data tied to a ``DataProduct`` that was automatically ingested from a
-    broker. Requires authentication.
+    View that handles the updating of reduced data tied to a ``DataProduct`` that was ingested from a
+    dataservice. The ReducedDatum.source must match the DataService.name Requires authentication.
     """
     def get(self, request, *args, **kwargs):
         """

tom_dataservices/dataservices.py

@@ -323,6 +323,7 @@ def create_reduced_datums_from_query(self, target, data: List, data_type=None, *
         """
         Create and save new reduced_datums of the appropriate data_type from the query results
         Be sure to use `ReducedDatum.objects.get_or_create()` when creating new objects.
+        NOTE: Setting `ReducedDatum.source` to the the `DataService.name` will allow for automated data updates.
 
         :param target: Target Object to be associated with the reduced data
         :param data: List of data dictionaries of the appropriate `data_type`

tom_dataservices/models.py

@@ -11,7 +11,7 @@ class DataServiceQuery(models.Model):
         parameters: Parameters for this ``DataServiceQuery``, stored as a JSON string.
         created: The time at which this ``DataServiceQuery`` was created in the TOM database.
         modified: The time at which this ``DataServiceQuery`` was changed in the TOM database.
-        last_run: The time at which this ``DataServiceQuery`` was last run against its corresponding broker.
+        last_run: The time at which this ``DataServiceQuery`` was last run against its corresponding query service.
     """
     name = models.CharField(max_length=500)
     data_service = models.CharField(max_length=50)