test for category types

src/CategoryTypes.jl

@@ -18,17 +18,17 @@ function create_category_type_id_url(base_url :: String, category_type_id :: Int
         return base_url * string(category_type_id) * raw"/" * url_suffix
     else
         return base_url * string(category_type_id)
-    end 
+    end
 end
 
 
 function create_category_type_upload_url(base_url :: String, project_id :: Integer, version :: String="v1", url_suffix :: Union{String, Nothing}=nothing)
     base_url = create_project_id_url(base_url, project_id, version)
     base_url = if endswith(base_url, raw"/") base_url else base_url * raw"/" end
     if url_suffix !== nothing
-        return base_url * "category-types-upload" * raw"/" * url_suffix
+        return base_url * "category-type-upload" * raw"/" * url_suffix
     else
-        return base_url * "category-types-upload"
+        return base_url * "category-type-upload"
     end
 end
 
@@ -40,7 +40,16 @@ function make_update_category_type_request(url :: String, headers:: Vector{Pair{
     return HTTP.patch(url, headers, body=user_body; cookies = true)
 end
 
-function make_category_type_upload_request(url :: String, headers :: Vector{Pair{String, String}}, file_io :: Union{Dict{String, Union{IOStream, IOBuffer}}, HTTP.Form, Dict{String, String}})
+function make_category_type_upload_request(url :: String, headers :: Vector{Pair{String, Any}}, file_io :: Union{
+                                               String,
+                                               IOStream,
+                                               IOBuffer,
+                                               HTTP.Forms.Form,
+                                               Dict{String, String},
+                                               Dict{String, HTTP.Forms.Multipart{IOStream}},
+                                               Dict{String, IOBuffer},
+                                               Dict{String, IOStream}
+                                               })
     return HTTP.post(url, headers, file_io; cookies = true)
 end
 
@@ -52,11 +61,18 @@ function get_category_types(base_url :: String, project_id :: Integer, _csrf_tok
             global category_types = JSON3.read(String(read(io)))
         end
     end
-    return category_types 
+    return category_types
+end
+
+function get_category_type_ids(base_url :: String, project_id :: Integer, _csrf_token :: String, version :: String="v1")
+    category_types = get_category_types(base_url, project_id, _csrf_token, version)
+    category_type_ids = [category_type["id"] for category_type in category_types]
+    return category_type_ids
 end
 
 function get_category_type_detail(base_url :: String, project_id :: Integer, category_type_id :: Integer, _csrf_token :: String, version ::String="v1")
-    url = create_category_type_url(base_url, project_id, version, string(category_type_id))
+    url = create_category_type_url(base_url, project_id, version)
+    url = create_category_type_id_url(url, category_type_id)
     headers = ["X-CSRFToken"=>_csrf_token]
     HTTP.open("GET", url, headers; cookies = true) do io
         while !eof(io)
@@ -66,6 +82,16 @@ function get_category_type_detail(base_url :: String, project_id :: Integer, cat
     return category_type_detail
 end
 
+function get_category_type_by_name(base_url :: String, project_id :: Integer, category_type_name :: String, _csrf_token :: String, version ::String="v1")
+    category_types = get_category_types(base_url, project_id, _csrf_token, version)
+    for category_type in category_types
+        if category_type["text"] == category_type_name
+            return category_type
+        end
+    end
+    throw(error())
+end
+
 function create_category_type(base_url :: String, project_id :: Integer, _csrf_token :: String, text :: String, text_color :: String="#ffffff", background_color :: String="#cdcdcd", prefix_key :: Union{String, Nothing}=nothing, suffix_key :: Union{String, Nothing}=nothing, version :: String="v1")
     url = create_category_type_url(base_url, project_id, version)
     headers = ["X-CSRFToken"=>_csrf_token, "Content-Type" => "application/json", # Comment out with HTTP.Form, 
@@ -83,7 +109,8 @@ function create_category_type(base_url :: String, project_id :: Integer, _csrf_t
 end
 
 function update_category_type(base_url :: String, project_id :: Integer, category_type_id :: Integer, _csrf_token :: String,  text :: String, text_color :: String="#ffffff", background_color :: String="#cdcdcd", prefix_key :: Union{String, Nothing}=nothing, suffix_key :: Union{String, Nothing}=nothing, version :: String="v1")
-    url = create_category_type_url(base_url,project_id, version, string(category_type_id))
+    url = create_category_type_url(base_url, project_id, version)
+    url = create_category_type_id_url(url, category_type_id)
     headers = ["X-CSRFToken"=>_csrf_token, "Content-Type" => "application/json",
                "accept" => "application/json"]
 
@@ -121,14 +148,27 @@ end
 
 function upload_category_types(base_url :: String, project_id :: Integer, _csrf_token :: String, file_name :: Union{String, Vector{String}}, file_path :: Union{String, Vector{String}}="./", version :: String="v1")
     url = create_category_type_upload_url(base_url, project_id)
-    headers = ["X-CSRFToken"=>_csrf_token, "Content-Type" => "application/json",
-               "accept" => "application/json"]
+    @info "----------------Uploading Category Types -------------------"
     files = create_file_paths(file_name, file_path)
     req_responses = []
     for file in files
         file_io = open(file, "r")
-        upload_dict = Dict(["file" => read(file_io, String)])
+        file_name = create_uploadable_file_name(file)
+        multipart = HTTP.Multipart(file, file_io, "application/json")
+        #upload_dict = Dict(["file" => multipart])
+        upload_text = read(file_io, String)
+        @info "upload_text:"
+        @info upload_text
+        upload_dict = HTTP.Form(Dict(["file" => multipart]))
+        @info "upload_dict:"
+        @info upload_dict
+        #headers = ["X-CSRFToken"=>_csrf_token, "Content-Type" =>  "multipart/form-data; boundary=----WebkitFormBoundaryxuRflWRLKyUvZXIa", "Content-Length" => length(upload_text)]
+        headers = ["X-CSRFToken"=>_csrf_token, "Content-Type" =>  "application/json", "Content-Length" => length(String(take!(multipart.data)))]
+        @info "headers:"
+        @info headers
         r = make_category_type_upload_request(url, headers, upload_dict)
+        @info "request results:"
+        @info r
         push!(req_responses, JSON3.read(r.body))
     end
     return req_responses

src/utils/Filenames.jl

@@ -10,7 +10,7 @@ function create_file_paths(file_names :: Union{String, Vector{String}}, file_pat
             for (path, name) in zip(file_path, file_names)
                 push!(file_paths, string(URI(path * raw"/" *  name)))
             end
-        
+
         elseif number_of_paths == 1
             path = file_path[1]
             for name in file_names
@@ -31,7 +31,7 @@ function create_file_paths(file_names :: Union{String, Vector{String}}, file_pat
         for name in file_names
             push!(file_paths, string(URI(path * raw"/" *  name)))
         end
-    
+
     elseif isa(file_names, String) && isa(file_path, Vector)
         file_names = [file_names for _ in 1:length(file_path)]
         println("zip file and path")
@@ -42,7 +42,7 @@ function create_file_paths(file_names :: Union{String, Vector{String}}, file_pat
     else
         path = file_path
         name = file_names
-        push!(file_paths, string(URI(path * raw"/" *  name)))   
+        push!(file_paths, string(URI(path * raw"/" *  name)))
 
     end
     return file_paths
@@ -53,4 +53,4 @@ function create_uploadable_file_name(file_name)
     return String(last(split(file_uri.path, "/")))
 end
 
-println(create_uploadable_file_name("src/sample_classification_inputs.jsonl"))
+#println(create_uploadable_file_name("src/sample_classification_inputs.jsonl"))

test/assets/sample_category_types.json

@@ -0,0 +1,17 @@
+[
+    {
+        "text": "y",
+        "prefix_key": "ctrl",
+        "suffix_key": "y",
+        "background_color": "#68BC00",
+        "text_color": "#eeeeee"
+    },
+    {
+        "text": "n",
+        "prefix_key": "ctrl",
+        "suffix_key": "n",
+        "background_color": "#F44E3B",
+        "text_color": "#eeeeee"
+
+    }
+]

test/test_CategoryTypes.jl

@@ -0,0 +1,59 @@
+include("../src/CategoryTypes.jl")
+using Test
+
+@testset "CategoryTypes - Upload Functions" begin
+    base_url = ENV["DOCCANO_BASE_URL"]
+    test_project_id = 1
+    version = "v1"
+    sample_category_types_file_name = "sample_category_types.json"
+    sample_category_types_file_path = "test/assets"
+    upload_category_types(base_url, test_project_id, csrf_token, sample_category_types_file_name, sample_category_types_file_path, version)
+    @test isa(base_url, String)
+end
+
+@testset "CategoryTypes - Get Functions" begin
+    base_url = ENV["DOCCANO_BASE_URL"]
+    test_project_id = 1
+    version = "v1"
+    category_types = get_category_types(base_url, test_project_id, csrf_token, version)
+    test_category_type_id = first(category_types["results"])["id"]
+    test_category_type_detail = get_category_type_detail(base_url, test_project_id, test_category_type_id, csrf_token)
+    @test length(category_types["results"]) == 2
+    @test isa(test_category_type_detail["text"], String)
+end
+
+@testset "CategoryTypes - CategoryType Id Functions" begin
+    base_url = ENV["DOCCANO_BASE_URL"]
+    test_project_id = 1
+    version = "v1"
+    category_type_ids = get_category_type_ids(base_url, test_project_id, csrf_token, version)
+    @test length(category_type_ids) == 2
+    @test category_type_ids == collect(1:2)
+end
+
+@testset "CategoryTypes - Update Functions" begin
+    base_url = ENV["DOCCANO_BASE_URL"]
+    test_project_id = 1
+    version = "v1"
+    category_types = get_category_types(base_url, test_project_id, csrf_token, version)
+    test_category_type_id = first(category_types["results"])["id"]
+    test_category_type_detail = get_category_type_detail(base_url, test_project_id, test_category_type_id, csrf_token)
+    update_category_type_name = test_category_type_detail["text"] + "zzzz"
+    update_response = update_category_type_elements(base_url, test_project_id, test_category_type_id, csrf_token, update_category_type_name, text_color="#ffffff", background_color="#4D64AE")
+    test_category_type_detail = get_category_type_detail(base_url, test_project_id, test_category_type_id, csrf_token)
+    @test endswith(test_category_type_detail["text"], "zzzz")
+    @test test_category_type_detail["text_color"] == "#ffffff"
+    @test test_category_type_detail["background_color"] == "#4D64AE"
+
+end
+
+@testset "CategoryTypes - Link Creation" begin
+    base_url = ENV["DOCCANO_BASE_URL"]
+    test_project_id = 1
+    version = "v1"
+    test_example_id = 1
+    category_type_url = create_category_type_url(base_url, test_project_id, version)
+    test_category_type_url = if endswith(base_url, raw"/") "$(base_url)$(version)/$(test_project_id)/category-types" else "$(base_url)/$(version)/$(test_project_id)/category-types" end
+    @test category_type_url == test_category_type_url
+end
+

test/test_Full.jl

@@ -4,3 +4,4 @@ include("test_Projects.jl")
 include("test_Roles.jl")
 include("test_Members.jl")
 include("test_Examples.jl")
+include("test_CategoryTypes.jl")