improvements in contribute feature

Author: parteekcoder

.github/workflows/pull_request.yml

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check if the first 3 arguments are provided
-if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+if [ -z $1 ] || [ -z $2 ] || [ -z $3 ]; then
     echo "Error: The first 3 arguments are mandatory."
     echo "Usage: ./contribute <Study-Name> <Full-Path-To-Study> <Author-Name> <Branch-Name> <PR-title> <PR-Body>"
     exit 1
@@ -11,13 +11,13 @@ fi
 arg4=$4
 arg5=$5
 arg6=$6
-if [ -z "$4" ]; then
+if [ -z $4 ]; then
 arg4="#"
 fi
-if [ -z "$5" ]; then
+if [ -z $5 ]; then
 arg5="#"
 fi
-if [ -z "$6" ]; then
+if [ -z $6 ]; then
 arg6="#"
 fi
-python contribute.py $1 $2 $3 $arg4 $arg5 $arg6
+python3 contribute.py $1 $2 $3 $arg4 $arg5 $arg6

contribute

@@ -4,17 +4,16 @@
 
 # Intializing the Variables
 # Hashed token
-BOT_TOKEN = 'Z2l0aHViX3BhdF8xMUFYS0pGVFkwUWVWZ3AzbkpkWk8yX3BOc1VncDFIVDMwZVNXcHhBNm9acHhMaGZGdU5CdE85TGpqdXF1UWRRNzI2S01aUk5HRUNGanFWNDZi'
-REPO_NAME = 'concore'        #repo name
+BOT_TOKEN = 'Z2l0aHViX3BhdF8xMUFYS0pGVFkwd2xwT0dmYldFOTBBXzN3Nkx2THpiaUFKek5pTDdqNlpLUzVwUUpoTlJWR3dtNnM0NWNDa0RmWTJaTTZLSUpHRHhERlhrZlJS'
+REPO_NAME = 'concore-studies'        #repo name
 OWNER_NAME = 'parteekcoder123'  #bot account name
 STUDY_NAME =  sys.argv[1]
 STUDY_NAME_PATH =  sys.argv[2]
 AUTHOR_NAME =  sys.argv[3]
 BRANCH_NAME =  sys.argv[4]
 PR_TITLE =  sys.argv[5]
 PR_BODY =  sys.argv[6]
-UPSTREAM_OWNER = 'parteekcoder'   # upstream to which examples should be contributed
-
+UPSTREAM_OWNER = 'ControlCore-Project'   # upstream to which examples should be contributed
 
 # Defining Functions
 def checkInputValidity():
@@ -77,9 +76,9 @@ def fetchUpstream(repo,base_sha,branch):
 def runWorkflow(repo,upstream_repo):
     openPR = anyOpenPR(upstream_repo)
     if openPR==None:
-        workflow_runned = repo.get_workflow(id_or_name="pull_request.yml").create_dispatch(ref=BRANCH_NAME,inputs={'title':PR_TITLE,'body':PR_BODY,'upstreamRepo':upstream_repo,'botRepo':OWNER_NAME,'repo':REPO_NAME})
+        workflow_runned = repo.get_workflow(id_or_name="pull_request.yml").create_dispatch(ref=BRANCH_NAME,inputs={'title':PR_TITLE,'body':PR_BODY,'upstreamRepo':UPSTREAM_OWNER,'botRepo':OWNER_NAME,'repo':REPO_NAME})
         if not workflow_runned:
-            print("Some Error Occured.Please try after some time")
+            print("Some error occured.Please try after some time")
             exit(0)
         else:
             printPRStatus(upstream_repo)
@@ -105,10 +104,10 @@ def isImageFile(filename):
     return file_extension.lower() in image_extensions
 
 # Encode Github Token
-def encode_token(token):
-    encoded_bytes = base64.b64encode(token.encode('utf-8'))
-    encoded_token = encoded_bytes.decode('utf-8')
-    return encoded_token
+# def encode_token(token):
+#     encoded_bytes = base64.b64encode(token.encode('utf-8'))
+#     encoded_token = encoded_bytes.decode('utf-8')
+#     return encoded_token
 
 
 # Decode Github Token

contribute.py

@@ -2,3 +2,4 @@ Flask
 gunicorn==20.1.0
 FLASK_CORS
 jupyterlab
+PyGithub

fri/requirements.txt

@@ -182,7 +182,10 @@ def contribute():
         if(platform.uname()[0]=='Windows'):
             proc=check_output(["contribute",STUDY_NAME,STUDY_NAME_PATH,AUTHOR_NAME,BRANCH_NAME,PR_TITLE,PR_BODY],cwd=concore_path,shell=True)
         else:
-            proc = check_output(["./contribute",STUDY_NAME,STUDY_NAME_PATH,AUTHOR_NAME,BRANCH_NAME,PR_TITLE,PR_BODY],cwd=concore_path)
+            if len(BRANCH_NAME)==0:
+                proc = check_output(["./contribute",STUDY_NAME,STUDY_NAME_PATH,AUTHOR_NAME],cwd=concore_path)
+            else:
+                proc = check_output(["./contribute",STUDY_NAME,STUDY_NAME_PATH,AUTHOR_NAME,BRANCH_NAME,PR_TITLE,PR_BODY],cwd=concore_path)
         output_string = proc.decode()
         status=200
         if output_string.find("/pulls/")!=-1:
@@ -193,7 +196,6 @@ def contribute():
             status=400
         return jsonify({'message': output_string}),status
     except Exception as e:
-        print(e)
         output_string = "Some Error occured.Please try after some time"
         status=501
     return jsonify({'message': output_string}),status