Commit 1d2d97f9 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[list] upload CSV endpoint works, but 400 error still thrown

Also, updated nix a bit.
parent eaed01a4
Pipeline #1664 passed with stage
in 22 minutes and 28 seconds
......@@ -2,5 +2,5 @@ import (builtins.fetchGit {
name = "nixos-21.05";
url = "https://github.com/nixos/nixpkgs";
ref = "refs/heads/nixos-21.05";
rev = "6613a30c5e3ee59753181512b4bedd4121569925";
rev = "7e9b0dff974c89e070da1ad85713ff3c20b0ca97";
})
......@@ -22,12 +22,12 @@ rec {
zlib
blas
gfortran7
gfortran7.cc.lib
# gfortran7.cc.lib
];
libPaths = pkgs.lib.makeLibraryPath nonhsBuildInputs;
shellHook = ''
export LD_LIBRARY_PATH="${libPaths}"
export LIBRARY_PATH="${libPaths}"
export LD_LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
export LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}"
'';
shell = pkgs.mkShell {
name = "gargantext-shell";
......
......@@ -24,6 +24,16 @@ import Data.Set (Set)
import Data.Swagger (ToSchema, declareNamedSchema, genericDeclareNamedSchema)
import Data.Text (Text, concat, pack)
import GHC.Generics (Generic)
import Network.HTTP.Media ((//), (/:))
import Servant
import Servant.Job.Async
import Servant.Job.Utils (jsonOptions)
import Web.FormUrlEncoded (FromForm)
import qualified Data.HashMap.Strict as HashMap
import qualified Data.List as List
import qualified Data.Map as Map
import qualified Data.Text as Text
import Gargantext.API.Admin.Orchestrator.Types
import Gargantext.API.Ngrams (getNgramsTableMap, setListNgrams)
import Gargantext.API.Ngrams.Tools (getTermsWith)
......@@ -44,15 +54,6 @@ import Gargantext.Database.Schema.Ngrams
import Gargantext.Database.Schema.Node
import Gargantext.Database.Types (Indexed(..))
import Gargantext.Prelude
import Network.HTTP.Media ((//), (/:))
import Servant
import Servant.Job.Async
import Servant.Job.Utils (jsonOptions)
import Web.FormUrlEncoded (FromForm)
import qualified Data.HashMap.Strict as HashMap
import qualified Data.List as List
import qualified Data.Map as Map
import qualified Data.Text as Text
------------------------------------------------------------------------
type API = Get '[JSON, HTML] (Headers '[Header "Content-Disposition" Text] NgramsList)
......@@ -184,7 +185,7 @@ type PostAPI = Summary "Update List"
postAsync :: ListId -> GargServer PostAPI
postAsync lId =
serveJobsAPI $
JobFunction (\f log' -> postAsync' lId f (liftBase . log'))
JobFunction (\f log' -> postAsync' lId f (liftBase . log'))
postAsync' :: FlowCmdM env err m
=> ListId
......@@ -208,6 +209,7 @@ postAsync' l (WithFile _ m _) logStatus = do
------------------------------------------------------------------------
type CSVPostAPI = Summary "Update List (legacy v3 CSV)"
:> "csv"
:> "add"
:> "form"
:> "async"
:> AsyncJobs JobLog '[FormUrlEncoded] WithFile JobLog
......@@ -215,7 +217,10 @@ type CSVPostAPI = Summary "Update List (legacy v3 CSV)"
csvPostAsync :: ListId -> GargServer PostAPI
csvPostAsync lId =
serveJobsAPI $
JobFunction (\f log' -> csvPostAsync' lId f (liftBase . log'))
JobFunction $ \f@(WithFile ft _ n) log' -> do
printDebug "[csvPostAsync] filetype" ft
printDebug "[csvPostAsync] name" n
csvPostAsync' lId f (liftBase . log')
csvPostAsync' :: FlowCmdM env err m
=> ListId
......@@ -223,7 +228,6 @@ csvPostAsync' :: FlowCmdM env err m
-> (JobLog -> m ())
-> m JobLog
csvPostAsync' l (WithFile _ m _) logStatus = do
logStatus JobLog { _scst_succeeded = Just 0
, _scst_failed = Just 0
, _scst_remaining = Just 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment