Merge branch 'feature/share-cleanupgrade-2025' into mob/2025-03-05

Author: aaxelb

bin/share

@@ -218,7 +218,7 @@ services:
 
   indexer:
     image: quay.io/centerforopenscience/share:develop
-    command: sharectl search daemon
+    command: python manage.py shtrove_indexer_run
     depends_on:
       - postgres
       - rabbitmq

docker-compose.yml

@@ -46,16 +46,15 @@ a shell running within SHARE's environment in docker:
 docker-compose run --rm --no-deps worker bash
 ```
 this will open a bash prompt within a temporary `worker` container -- from here we can
-run commands within SHARE's environment, including django's `manage.py` and SHARE's own
-`sharectl` utility (defined in `share/bin/`)
+run commands within SHARE's environment, including django's `manage.py`
 
 from within that worker shell, use django's `migrate` command to set up tables in postgres:
 ```
 python manage.py migrate
 ```
 ...and use `sharectl` to set up indexes in elasticsearch:
 ```
-sharectl search setup --initial
+python manage.py shtrove_search_setup --initial
 ```
 
 ### 3. start 'em up
@@ -93,7 +92,7 @@ docker-compose up -d worker
 
 ### start a shell in a container
 there are several ways to open a shell with SHARE's environment (which has
-django's `manage.py` and SHARE's own `sharectl` utility, defined in `share/bin/`)
+django's `manage.py` and management commands defined in `management/commands/`
 
 if `worker` is already up, can open a shell within that container:
 ```

how-to/run-locally.md

@@ -25,7 +25,6 @@ gevent==22.10.2  # MIT
 psycogreen==1.0.2  # BSD
 
 # to be removed in future work:
-docopt==0.6.2  # MIT
 elasticsearch5==5.5.6  # Apache 2.0
 PyJWE==1.0.0 # Apache 2.0
 

requirements.txt

@@ -10,9 +10,6 @@
         'share.harvesters'
     ],
     entry_points={
-        'console_scripts': [
-            'sharectl = share.bin.__main__:main',
-        ],
         'share.transformers': [
             'ca.lwbin = share.transformers.ca_lwbin:LWBINTransformer',
             'com.biomedcentral = share.transformers.com_biomedcentral:BioMedCentralTransformer',

setup.py

@@ -0,0 +1,17 @@
+from django.core.management.base import BaseCommand
+from share.search.daemon import IndexerDaemonControl
+from project.celery import app as celery_app
+
+
+class Command(BaseCommand):
+    help = "Start the search indexing daemon"
+
+    def handle(self, *args, **options):
+        daemon_control = IndexerDaemonControl(celery_app)
+        daemon_control.start_all_daemonthreads()
+        try:
+            daemon_control.stop_event.wait()
+        except KeyboardInterrupt:
+            pass
+        finally:
+            daemon_control.stop_daemonthreads(wait=True)