Fix bugs and enable app pushing

Author: FM1337

.github/workflows/build.yml

@@ -27,10 +27,10 @@ jobs:
           name: fmcore/coreapi
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-  # post-to-webhook:
-  #   needs: [docker-publish-latest]
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - run: |
-  #         set +x
-  #         curl -XPOST -H 'X-Webhook-Auth: ${{ secrets.WEBHOOK_SECRET }}' -H "Content-type: application/json" -d '{"app": "flagbrew", "service": "coreapi"}' '${{ secrets.WEBHOOK_URL }}'
+  post-to-webhook:
+    needs: [docker-publish-latest]
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          set +x
+          curl -XPOST -H 'X-Webhook-Auth: ${{ secrets.WEBHOOK_SECRET }}' -H "Content-type: application/json" -d '{"app": "flagbrew", "service": "coreapi"}' '${{ secrets.WEBHOOK_URL }}'

http.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/FlagBrew/CoreAPI/internal/handlers/generalhandler"
 	"github.com/FlagBrew/CoreAPI/internal/handlers/infohandler"
 	"github.com/FlagBrew/CoreAPI/internal/handlers/legalityhandler"
 	"github.com/go-chi/chi/v5"
@@ -73,9 +74,7 @@ func httpServer(ctx context.Context) *http.Server {
 
 	r.Route("/api/info", infohandler.NewHandler().Route)
 	r.Route("/api/legality", legalityhandler.NewHandler().Route)
-	r.Get("/ping", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("pong"))
-	})
+	r.Route("/api/general", generalhandler.NewHandler().Route)
 
 	return &http.Server{
 		Addr:    cli.Flags.HTTP.Addr,

internal/handlers/generalhandler/handler.go

@@ -0,0 +1,45 @@
+package generalhandler
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/FlagBrew/CoreAPI/internal/models"
+	"github.com/FlagBrew/CoreAPI/internal/utils"
+	"github.com/go-chi/chi/v5"
+	"github.com/lrstanley/chix"
+)
+
+type Handler struct {
+}
+
+func NewHandler() *Handler {
+	return &Handler{}
+}
+
+func (h *Handler) Route(r chi.Router) {
+	r.Get("/ping", h.ping)
+}
+
+func (h *Handler) ping(w http.ResponseWriter, r *http.Request) {
+	start := time.Now()
+	version, err := utils.RunCorePython("version", "potato", "", r.Context())
+
+	if err != nil {
+		chix.Error(w, r, fmt.Errorf("something went wrong, please try again later"))
+		return
+	}
+
+	v := &models.ALMVersion{}
+	if err := json.Unmarshal([]byte(version), &v); err != nil {
+		chix.Error(w, r, fmt.Errorf("something went wrong, please try again later"))
+		return
+	}
+
+	chix.JSON(w, r, 200, chix.M{
+		"alm_version":   v.Version,
+		"response_time": time.Since(start).Milliseconds(),
+	})
+}

internal/models/misc.go

@@ -0,0 +1,5 @@
+package models
+
+type ALMVersion struct {
+	Version string `json:"alm_version"`
+}

internal/models/requests.go

@@ -4,6 +4,11 @@ type GetInfoRequest struct {
 	Generation string `json:"generation" form:"generation" query:"generation" validate:"omitempty,oneof=1 2 3 4 5 6 7 8 9 LGPE BDSP PLA"`
 }
 
+type GetInfoRequestB64 struct {
+	Generation string `json:"generation" form:"generation" query:"generation" validate:"omitempty,oneof=1 2 3 4 5 6 7 8 9 LGPE BDSP PLA"`
+	Base64     string `json:"base64" form:"base64" query:"base64" validate:"required"`
+}
+
 type LegalityCheckRequest struct {
 	Generation string `json:"generation" form:"generation" query:"generation" validate:"omitempty,oneof=1 2 3 4 5 6 7 8 9 LGPE BDSP PLA"`
 }

python/main.py

@@ -1,3 +1,5 @@
+# type: ignore ReportMissingImport
+
 import base64
 import signal
 from utils.load import *
@@ -8,14 +10,15 @@
 from utils.sprites import Sprites
 import json
 import sys
+from PKHeX.Core.AutoMod import ALMVersion
 
 language = LanguageStrings()
 sprites = Sprites()
 moveTypes = MoveTypes()
 
 def handleArgs():
     parser = argparse.ArgumentParser()
-    parser.add_argument('--mode', type=str, required=True, choices=['legalize', 'report', 'info'], help='The function to perform')
+    parser.add_argument('--mode', type=str, required=True, choices=['legalize', 'report', 'info', 'version'], help='The function to perform')
     parser.add_argument('--pkmn', type=str, required=True, help='The base64 encoded pokemon to perform the function on')
     parser.add_argument('--generation', type=str, required=False, help='The generation of the pokemon to perform the function on')
     return parser.parse_args()
@@ -55,6 +58,12 @@ def autoLegality(pkmn, generation):
     }))
     sys.stdout.write("\n")
     sys.stdout.flush()
+def version():
+    sys.stdout.write(json.dumps({
+        "alm_version": ALMVersion.CurrentVersion
+    }))
+    sys.stdout.write("\n")
+    sys.stdout.flush()
 
 
 def getInfo(pkmn):
@@ -72,6 +81,10 @@ def handleTermination(signum, frame):
     signal.signal(signal.SIGINT, handleTermination)
     signal.signal(signal.SIGTERM, handleTermination)
 
+    if args.mode == 'version':
+        version()
+        sys.exit(0)
+
     pkmn, error = get_pokemon_from_base64(args.pkmn, args.generation)
     if error is not None:
         sys.stderr.write(json.dumps(error, ensure_ascii=False))
@@ -88,7 +101,7 @@ def handleTermination(signum, frame):
             sys.stderr.write(json.dumps({"error": "something went wrong with legalizing your Pokemon"}))
             sys.stderr.write("\n")
             sys.stderr.flush()
-            print(e)
+            # print(e)
             sys.exit(1)
     elif args.mode == 'info':
         try:
@@ -97,5 +110,5 @@ def handleTermination(signum, frame):
             sys.stderr.write(json.dumps({"error": "something went wrong with getting info for your Pokemon"}))
             sys.stderr.write("\n")
             sys.stderr.flush()
-            print(e)
+            # print(e)
             sys.exit(1)

python/utils/legality.py

@@ -45,7 +45,7 @@ def legalize(pkmn, generation):
 
     legalized, err = helpers.get_pokemon_from_base64(result, generation)
     if err is not None:
-        print(err, info.Generation)
+        # print(err, info.Generation)
         return None
 
     SimpleEdits.SetTrainerData(legalized, info)

python/utils/pkmn.py

@@ -1,7 +1,7 @@
 # type: ignore ReportMissingImport
 
 import json
-from utils.helpers import LanguageStrings, MoveTypes
+from utils.helpers import LanguageStrings, MoveTypes, get_generation_from_version
 from utils.sprites import Sprites
 from utils.weridness import fix_weridness_for_strings
 from utils.legality import legality_check
@@ -79,7 +79,7 @@ def __init__(self, pkmn, strings: LanguageStrings, moveTypes: MoveTypes, spriteH
 
         self.ot_gender = GameInfo.GenderSymbolASCII[pkmn.OT_Gender]
         self.is_legal, self.illegal_reasons = legality_check(pkmn)
-        self.generation = pkmn.Generation
+        self.generation = get_generation_from_version(pkmn.Version)
         self.dex_number = pkmn.Species
         self.size = pkmn.SIZE_STORED
         self.item_num = pkmn.HeldItem

python/utils/sprites.py

@@ -139,14 +139,14 @@ def generate_bindings(strings: LanguageStrings):
             lastIndex = data.get("last_index")
             # check the size
             if len(species_form) != data.get('last_size'):
-                print(len(species_form), data.get('last_size'))
+                # print(len(species_form), data.get('last_size'))
                 q = input("The size of the species_form list is different than the lastSize in bindings.json, do you want to start from the beginning? (y/n): ")
                 if q == "y":
                     lastIndex = 0
     except FileNotFoundError:
         pass
 
-    print("There are {} forms to go through and you have gotten through {} of them, meaning {} more to go, good luck, you're doing this manually".format(len(species_form), lastIndex, len(species_form)- lastIndex))
+    # print("There are {} forms to go through and you have gotten through {} of them, meaning {} more to go, good luck, you're doing this manually".format(len(species_form), lastIndex, len(species_form)- lastIndex))
     bindings = {}
     if lastIndex != 0:
         bindings = data.get('bindings')
@@ -204,7 +204,7 @@ def generate_bindings(strings: LanguageStrings):
                 "last_index": species_form.index(s),
                 "last_size": len(species_form)
             }, f, indent=4)
-        print("Interrupted, saved bindings to bindings.json")
+        # print("Interrupted, saved bindings to bindings.json")
 
 
 

python/utils/weridness.py

@@ -36,7 +36,7 @@ def fix_weridness_for_strings(input: str):
             string = split[-1]
             # replace the input with the new string
             input = input.replace(match, string)
-            print(split, string, input)
+            # print(split, string, input)
 
 
     # if there isn't anything we need to fix, just return the input