Merge branch 'master' into edeno_decoding

LorenFrankLab · Oct 2, 2023 · 64a2e66 · 64a2e66
2 parents d2015f5 + ec56049
commit 64a2e66
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 24 deletions.
diff --git a/config/add_dj_collaborator.py b/config/add_dj_collaborator.py
@@ -3,25 +3,24 @@
 import sys
 import tempfile
 
-# shared_modules = [
-#     "common\_%",
-#     "spikesorting\_%",
-#     "decoding\_%",
-#     "position\_%",
-#     "lfp\_%",
-# ]
-
 
 def add_collab_user(user_name):
-    # create a tempoary file for the command
+    # create a temporary file for the command
     file = tempfile.NamedTemporaryFile(mode="w")
 
+    # Create the user (if not already created) and set the password
+    file.write(
+        f"CREATE USER IF NOT EXISTS '{user_name}'@'%' IDENTIFIED BY 'temppass';\n"
+    )
+
+    # Grant privileges to databases matching the user_name pattern
     file.write(
-        f"GRANT ALL PRIVILEGES ON `{user_name}\_%`.* TO `{user_name}`@'%' IDENTIFIED BY 'temppass';\n"
+        f"GRANT ALL PRIVILEGES ON `{user_name}\_%`.* TO '{user_name}'@'%';\n"
     )
-    # for module in shared_modules:
-    #     file.write(f"GRANT ALL PRIVILEGES ON `{module}`.* TO `{user_name}`@'%';\n")
-    file.write(f"GRANT SELECT ON `%`.* TO `{user_name}`@'%';\n")
+
+    # Grant SELECT privileges on all databases
+    file.write(f"GRANT SELECT ON `%`.* TO '{user_name}'@'%';\n")
+
     file.flush()
 
     # run those commands in sql

diff --git a/config/add_dj_guest.py b/config/add_dj_guest.py
@@ -8,20 +8,27 @@
     "spikesorting\_%",
     "decoding\_%",
     "position\_%",
+    "position_linearization\_%",
+    "ripple\_%",
     "lfp\_%",
 ]
 
 
 def add_user(user_name):
-    # create a tempoary file for the command
+    # create a temporary file for the command
     file = tempfile.NamedTemporaryFile(mode="w")
 
+    # Create the user (if not already created) and set password
     file.write(
-        f"GRANT SELECT ON `%`.* TO `{user_name}`@'%' IDENTIFIED BY 'Data_$haring';\n"
+        f"CREATE USER IF NOT EXISTS '{user_name}'@'%' IDENTIFIED BY 'Data_$haring';\n"
     )
+
+    # Grant privileges
+    file.write(f"GRANT SELECT ON `%`.* TO '{user_name}'@'%';\n")
+
     file.flush()
 
-    # run that commands in sql
+    # run those commands in sql
     os.system(f"mysql -p -h lmf-db.cin.ucsf.edu < {file.name}")
 
 

diff --git a/config/add_dj_module.py b/config/add_dj_module.py
@@ -4,7 +4,7 @@
 import sys
 import tempfile
 
-target_group = "kachery-users"
+TARGET_GROUP = "kachery-users"
 
 
 def add_module(module_name):
@@ -15,10 +15,16 @@ def add_module(module_name):
 
     # find the kachery-users group
     groups = grp.getgrall()
+    group_found = False  # initialize the flag as False
     for group in groups:
-        if group.gr_name == target_group:
+        if group.gr_name == TARGET_GROUP:
+            group_found = True  # set the flag to True when the group is found
             break
 
+    # Check if the group was found
+    if not group_found:
+        sys.exit(f"Error: The target group {TARGET_GROUP} was not found.")
+
     # get a list of usernames
     for user in group.gr_mem:
         file.write(

diff --git a/config/add_dj_user.py b/config/add_dj_user.py
@@ -3,7 +3,15 @@
 import sys
 import tempfile
 
-shared_modules = ["common\_%", "spikesorting\_%", "decoding\_%"]
+shared_modules = [
+    "common\_%",
+    "spikesorting\_%",
+    "decoding\_%",
+    "position\_%",
+    "position_linearization\_%",
+    "ripple\_%",
+    "lfp\_%",
+]
 
 
 def add_user(user_name):
@@ -14,15 +22,18 @@ def add_user(user_name):
 
     # create a tempoary file for the command
     file = tempfile.NamedTemporaryFile(mode="w")
-
-    file.write(
-        f"GRANT ALL PRIVILEGES ON `{user_name}\_%`.* TO `{user_name}`@'%' IDENTIFIED BY 'temppass';\n"
+    create_user_query = f"CREATE USER IF NOT EXISTS '{user_name}'@'%' IDENTIFIED BY 'temppass';\n"
+    grant_privileges_query = (
+        f"GRANT ALL PRIVILEGES ON `{user_name}\_%`.* TO '{user_name}'@'%';"
     )
+
+    file.write(create_user_query + "\n")
+    file.write(grant_privileges_query + "\n")
     for module in shared_modules:
         file.write(
-            f"GRANT ALL PRIVILEGES ON `{module}`.* TO `{user_name}`@'%';\n"
+            f"GRANT ALL PRIVILEGES ON `{module}`.* TO '{user_name}'@'%';\n"
         )
-    file.write(f"GRANT SELECT ON `%`.* TO `{user_name}`@'%';\n")
+    file.write(f"GRANT SELECT ON `%`.* TO '{user_name}'@'%';\n")
     file.flush()
 
     # run those commands in sql