diff --git a/extensions/skyportal/config.yaml.defaults b/extensions/skyportal/config.yaml.defaults index ae839ca..da6de3a 100644 --- 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 index edbca60..d41f875 100644 --- 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 index 2840afa..87a548d 100644 --- 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 index 51fde24..4e85850 160000 --- a/skyportal +++ b/skyportal @@ -1 +1 @@ -Subproject commit 51fde24a6e086034770885874fea2bc7899fd86b +Subproject commit 4e858501befd64859c9fca772bfeb60c7f7f4e2c