Requests return dynamic

This commit is contained in:
2021-08-01 21:38:15 -06:00
parent 8a64ca356d
commit 6ec7d86a0a
4 changed files with 22 additions and 21 deletions

View File

@@ -1,2 +1 @@
import requests_externs.Response;
import requests_externs.Requests; import requests_externs.Requests;

View File

@@ -2,8 +2,8 @@ package nat.systems;
import kiss.Prelude; import kiss.Prelude;
import kiss.List; import kiss.List;
import requests_externs.Response;
import nat.System; import nat.System;
import haxe.Json;
@:build(kiss.Kiss.build()) @:build(kiss.Kiss.build())
class MediaWikiSystem extends System {} class MediaWikiSystem extends System {}

View File

@@ -12,13 +12,15 @@
// TODO make this an externMethod -- // TODO make this an externMethod --
// but mediaWikiUrl, headers, and maxLag will still have to be specified, not as args // but mediaWikiUrl, headers, and maxLag will still have to be specified, not as args
// unless all vars and props are passed to externmethods by default // unless all vars and props are passed to externmethods by default
(method :Response queryProp [:Array<String> titles :Array<String> props] (method :Dynamic queryProp [:Array<String> titles :Array<String> props]
(#extern Response python (Json.parse
(#extern String python
(object (object
hxmlFile "extern-files/python/args.hxml" hxmlFile "extern-files/python/args.hxml"
importHxFile "extern-files/python/import.hx" importHxFile "extern-files/python/import.hx"
langProjectFile "extern-files/python/requirements.txt") langProjectFile "extern-files/python/requirements.txt")
[:Array<String> titles _ :Array<String> props _ :String mediaWikiUrl _ :String maxLag (if maxLag (Std.string maxLag) "1") :Map<String,String> headers _] [:Array<String> titles _ :Array<String> props _ :String mediaWikiUrl _ :String maxLag (if maxLag (Std.string maxLag) "1") :Map<String,String> headers _]
(let [response
(Requests.get mediaWikiUrl (Requests.get mediaWikiUrl
[ [
=>"action" "query" =>"action" "query"
@@ -27,6 +29,8 @@
=>"maxlag" maxLag =>"maxlag" maxLag
=>"format" "json" =>"format" "json"
] ]
(object headers headers)))) (object headers headers))]
(assert response.ok)
response.text))))
(var headers [=>"User-Agent" "NatArchiveTool/0.0.0 (https://github.com/NQNStudios/kisslang/tree/main/projects/nat-archive-tool; natquaylenelson@gmail.com) Requests/2.26.0"]) (var headers [=>"User-Agent" "NatArchiveTool/0.0.0 (https://github.com/NQNStudios/kisslang/tree/main/projects/nat-archive-tool; natquaylenelson@gmail.com) Requests/2.26.0"])

View File

@@ -31,6 +31,4 @@
(assert (= name "Adventure")))) (assert (= name "Adventure"))))
(let [wikipedia (new MediaWikiSystem "https://en.wikipedia.org/w/api.php" null null 1)] (let [wikipedia (new MediaWikiSystem "https://en.wikipedia.org/w/api.php" null null 1)]
//~(wikipedia.queryProp ["Phoenix Wright"] ["images"]) ~(wikipedia.queryProp ["Phoenix Wright"] ["images"]))
0
)