Bump to Skyportal 4e858501befd64859c9fca772bfeb60c7f7f4e2c

grandma-collaboration · Mar 8, 2024 · d51a51e · d51a51e
1 parent 9fa11e2
commit d51a51e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/extensions/skyportal/config.yaml.defaults b/extensions/skyportal/config.yaml.defaults
@@ -821,11 +821,13 @@ analysis_services:
     embeddings_store:
       summary:
         location: pinecone
-        environment: us-east1-gcp
         api_key:
         index_name: openai-skyportal-summary
         index_size: 1536
         model: text-embedding-ada-002
+        environment: gcp-starter
+        pod_type: p1.x1
+
 
 
 comments_folder: persistentdata/comments

diff --git a/extensions/skyportal/skyportal/app_server.py b/extensions/skyportal/skyportal/app_server.py
@@ -1,5 +1,4 @@
 import tornado.web
-import shutil
 
 from baselayer.app.app_server import MainPageHandler
 from baselayer.app.model_util import create_tables
@@ -18,6 +17,7 @@
     AssignmentHandler,
     BulkTNSHandler,
     CandidateHandler,
+    CandidateFilterHandler,
     CatalogQueryHandler,
     ClassificationHandler,
     ClassificationVotesHandler,
@@ -239,6 +239,7 @@ def log_request(self, handler):
         AnalysisProductsHandler,
     ),
     (r'/api/assignment(/.*)?', AssignmentHandler),
+    (r'/api/candidates_filter', CandidateFilterHandler),
     (r'/api/candidates(/[0-9A-Za-z-_]+)/([0-9]+)', CandidateHandler),
     (r'/api/candidates(/.*)?', CandidateHandler),
     (r'/api/catalogs/swift_lsxps', SwiftLSXPSQueryHandler),

diff --git a/extensions/skyportal/static/js/actions.js b/extensions/skyportal/static/js/actions.js
@@ -13,7 +13,6 @@ import * as topSourcesActions from "./ducks/topSources";
 import * as topSaversActions from "./ducks/topSavers";
 import * as recentSourcesActions from "./ducks/recentSources";
 import * as mmadetectorActions from "./ducks/mmadetector";
-import * as observationPlansActions from "./ducks/observationPlans";
 import * as instrumentsActions from "./ducks/instruments";
 import * as sourceCountsActions from "./ducks/sourceCounts";
 import * as observingRunsActions from "./ducks/observingRuns";
@@ -168,13 +167,6 @@ export default function hydrate(
           );
         });
       }
-      if (ducks_to_hydrate.includes("observationPlans")) {
-        dispatch(observationPlansActions.fetchObservationPlanNames()).then(
-          () => {
-            dispatch(hydrationActions.finishedHydrating("observationPlans"));
-          },
-        );
-      }
       if (ducks_to_hydrate.includes("analysisServices")) {
         dispatch(analysisServicesActions.fetchAnalysisServices()).then(() => {
           dispatch(hydrationActions.finishedHydrating("analysisServices"));

diff --git a/skyportal b/skyportal
+5 −3		.github/workflows/test_api_and_frontend.yaml
+64 −0		ARCHITECTURE.md
+51 −0		CODE-OF-CONDUCT.md
+2 −14		Dockerfile
+1 −1		baselayer
+3 −3		config.yaml.defaults
+66 −8		doc/setup.md
+2 −1		package.json
+12 −13		requirements.txt
+67 −20		services/openai_analysis_service/app.py
+81 −64		services/thumbnail_queue/thumbnail_queue.py
+2 −27		skyportal/app_server.py
+21 −19		skyportal/facility_apis/generic.py
+1 −1		skyportal/handlers/api/__init__.py
+52 −5		skyportal/handlers/api/annotation_services.py
+193 −0		skyportal/handlers/api/candidate.py
+2 −2		skyportal/handlers/api/config_handler.py
+3 −0		skyportal/handlers/api/gcn.py
+0 −4		skyportal/handlers/api/internal/__init__.py
+0 −798		skyportal/handlers/api/internal/image_analysis.py
+57 −12		skyportal/handlers/api/observation_plan.py
+133 −14		skyportal/handlers/api/photometry.py
+8 −19		skyportal/handlers/api/source.py
+44 −29		skyportal/handlers/api/summary_query.py
+16 −1		skyportal/handlers/api/webhook.py
+11 −0		skyportal/tests/api/candidates_sources_events/test_candidates.py
+79 −1		skyportal/tests/api/candidates_sources_events/test_photometry.py
+38 −102		skyportal/tests/frontend/test_scanning_page.py
+29 −5		skyportal/utils/gcn.py
+0 −8		static/js/actions.js
+12 −8		static/js/components/AddClassificationsScanningPage.jsx
+461 −889		static/js/components/CandidateList.jsx
+1 −1		static/js/components/CandidatesPreferences.jsx
+8 −3		static/js/components/DisplayPhotStats.jsx
+787 −542		static/js/components/FilterCandidateList.jsx
+0 −324		static/js/components/ImageAnalysisForm.jsx
+0 −21		static/js/components/ImageAnalysisPage.jsx
+36 −15		static/js/components/ObservationPlanRequestForm.jsx
+95 −55		static/js/components/ScanningPageCandidateAnnotations.jsx
+0 −10		static/js/components/Source.jsx
+152 −24		static/js/components/VegaPhotometry.jsx
+34 −3		static/js/components/VegaPlot.jsx
+20 −2		static/js/ducks/candidates.js
+5 −29		static/js/ducks/observationPlans.js
+0 −10		static/js/ducks/source.js