Fix/openapi generator source enum (#7)

os-rss · web-flow · commit 5ffa7cee6b93 · 2023-07-12T11:52:44.000-07:00
* dev/openapi.yaml: Source returned back to Enum type

* updated generated files
diff --git a/resources/dev-openai/.well-known/openapi.yaml b/resources/dev-openai/.well-known/openapi.yaml
@@ -65,8 +65,8 @@ components:
       type: object
       properties:
         source:
-          type: string
-          # $ref: "#/components/schemas/Source"
+          # type: string
+          $ref: "#/components/schemas/Source"
         source_id:
           title: Source Id
           type: string
@@ -114,8 +114,8 @@ components:
           title: Document Id
           type: string
         source:
-          type: string
-          # $ref: "#/components/schemas/Source"
+          # type: string
+          $ref: "#/components/schemas/Source"
         source_id:
           title: Source Id
           type: string
@@ -260,8 +260,8 @@ components:
       type: object
       properties:
         source:
-          type: string
-          # $ref: "#/components/schemas/Source"
+          # type: string
+          $ref: "#/components/schemas/Source"
         source_id:
           type: string
         url:
diff --git a/src/datastore/factory.jl b/src/datastore/factory.jl
@@ -23,6 +23,7 @@ global DATASTORE_MODULE = let
 end
 using Pkg
 function get_datastore()::Union{AbstractStorage,Nothing}
+    @info string("Requested datastore: ", datastore_env())
     isnothing(DATASTORE_MODULE) && error("DATASTORE environment variable must be non empty and valid")
 
     DATASTORE_MODULE.create_storage()
diff --git a/src/generated/.openapi-generator/VERSION b/src/generated/.openapi-generator/VERSION
@@ -1 +1 @@
-6.6.0
+7.0.0-SNAPSHOT
diff --git a/src/generated/docs/DocumentChunkMetadata.md b/src/generated/docs/DocumentChunkMetadata.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**source** | **String** |  | [optional] [default to nothing]
+**source** | [***Source**](Source.md) |  | [optional] [default to nothing]
 **source_id** | **String** |  | [optional] [default to nothing]
 **url** | **String** |  | [optional] [default to nothing]
 **created_at** | **String** |  | [optional] [default to nothing]
diff --git a/src/generated/docs/DocumentMetadata.md b/src/generated/docs/DocumentMetadata.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**source** | **String** |  | [optional] [default to nothing]
+**source** | [***Source**](Source.md) |  | [optional] [default to nothing]
 **source_id** | **String** |  | [optional] [default to nothing]
 **url** | **String** |  | [optional] [default to nothing]
 **created_at** | **String** |  | [optional] [default to nothing]
diff --git a/src/generated/docs/DocumentMetadataFilter.md b/src/generated/docs/DocumentMetadataFilter.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **document_id** | **String** |  | [optional] [default to nothing]
-**source** | **String** |  | [optional] [default to nothing]
+**source** | [***Source**](Source.md) |  | [optional] [default to nothing]
 **source_id** | **String** |  | [optional] [default to nothing]
 **author** | **String** |  | [optional] [default to nothing]
 **start_date** | **String** |  | [optional] [default to nothing]
diff --git a/src/generated/src/models/model_Document.jl b/src/generated/src/models/model_Document.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""Document
+
     Document(;
         id=nothing,
         text=nothing,
diff --git a/src/generated/src/models/model_DocumentChunk.jl b/src/generated/src/models/model_DocumentChunk.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""DocumentChunk
+
     DocumentChunk(;
         id=nothing,
         text=nothing,
diff --git a/src/generated/src/models/model_DocumentChunkMetadata.jl b/src/generated/src/models/model_DocumentChunkMetadata.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""DocumentChunkMetadata
+
     DocumentChunkMetadata(;
         source=nothing,
         source_id=nothing,
@@ -12,15 +13,15 @@
         document_id=nothing,
     )
 
-    - source::String
+    - source::Source
     - source_id::String
     - url::String
     - created_at::String
     - author::String
     - document_id::String
 """
 Base.@kwdef mutable struct DocumentChunkMetadata <: OpenAPI.APIModel
-    source::Union{Nothing, String} = nothing
+    source = nothing # spec type: Union{ Nothing, Source }
     source_id::Union{Nothing, String} = nothing
     url::Union{Nothing, String} = nothing
     created_at::Union{Nothing, String} = nothing
@@ -38,7 +39,7 @@ Base.@kwdef mutable struct DocumentChunkMetadata <: OpenAPI.APIModel
     end
 end # type DocumentChunkMetadata
 
-const _property_types_DocumentChunkMetadata = Dict{Symbol,String}(Symbol("source")=>"String", Symbol("source_id")=>"String", Symbol("url")=>"String", Symbol("created_at")=>"String", Symbol("author")=>"String", Symbol("document_id")=>"String", )
+const _property_types_DocumentChunkMetadata = Dict{Symbol,String}(Symbol("source")=>"Source", Symbol("source_id")=>"String", Symbol("url")=>"String", Symbol("created_at")=>"String", Symbol("author")=>"String", Symbol("document_id")=>"String", )
 OpenAPI.property_type(::Type{ DocumentChunkMetadata }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_DocumentChunkMetadata[name]))}
 
 function check_required(o::DocumentChunkMetadata)
diff --git a/src/generated/src/models/model_DocumentChunkWithScore.jl b/src/generated/src/models/model_DocumentChunkWithScore.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""DocumentChunkWithScore
+
     DocumentChunkWithScore(;
         id=nothing,
         text=nothing,
diff --git a/src/generated/src/models/model_DocumentMetadata.jl b/src/generated/src/models/model_DocumentMetadata.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""DocumentMetadata
+
     DocumentMetadata(;
         source=nothing,
         source_id=nothing,
@@ -11,14 +12,14 @@
         author=nothing,
     )
 
-    - source::String
+    - source::Source
     - source_id::String
     - url::String
     - created_at::String
     - author::String
 """
 Base.@kwdef mutable struct DocumentMetadata <: OpenAPI.APIModel
-    source::Union{Nothing, String} = nothing
+    source = nothing # spec type: Union{ Nothing, Source }
     source_id::Union{Nothing, String} = nothing
     url::Union{Nothing, String} = nothing
     created_at::Union{Nothing, String} = nothing
@@ -34,7 +35,7 @@ Base.@kwdef mutable struct DocumentMetadata <: OpenAPI.APIModel
     end
 end # type DocumentMetadata
 
-const _property_types_DocumentMetadata = Dict{Symbol,String}(Symbol("source")=>"String", Symbol("source_id")=>"String", Symbol("url")=>"String", Symbol("created_at")=>"String", Symbol("author")=>"String", )
+const _property_types_DocumentMetadata = Dict{Symbol,String}(Symbol("source")=>"Source", Symbol("source_id")=>"String", Symbol("url")=>"String", Symbol("created_at")=>"String", Symbol("author")=>"String", )
 OpenAPI.property_type(::Type{ DocumentMetadata }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_DocumentMetadata[name]))}
 
 function check_required(o::DocumentMetadata)
diff --git a/src/generated/src/models/model_DocumentMetadataFilter.jl b/src/generated/src/models/model_DocumentMetadataFilter.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""DocumentMetadataFilter
+
     DocumentMetadataFilter(;
         document_id=nothing,
         source=nothing,
@@ -13,15 +14,15 @@
     )
 
     - document_id::String
-    - source::String
+    - source::Source
     - source_id::String
     - author::String
     - start_date::String
     - end_date::String
 """
 Base.@kwdef mutable struct DocumentMetadataFilter <: OpenAPI.APIModel
     document_id::Union{Nothing, String} = nothing
-    source::Union{Nothing, String} = nothing
+    source = nothing # spec type: Union{ Nothing, Source }
     source_id::Union{Nothing, String} = nothing
     author::Union{Nothing, String} = nothing
     start_date::Union{Nothing, String} = nothing
@@ -38,7 +39,7 @@ Base.@kwdef mutable struct DocumentMetadataFilter <: OpenAPI.APIModel
     end
 end # type DocumentMetadataFilter
 
-const _property_types_DocumentMetadataFilter = Dict{Symbol,String}(Symbol("document_id")=>"String", Symbol("source")=>"String", Symbol("source_id")=>"String", Symbol("author")=>"String", Symbol("start_date")=>"String", Symbol("end_date")=>"String", )
+const _property_types_DocumentMetadataFilter = Dict{Symbol,String}(Symbol("document_id")=>"String", Symbol("source")=>"Source", Symbol("source_id")=>"String", Symbol("author")=>"String", Symbol("start_date")=>"String", Symbol("end_date")=>"String", )
 OpenAPI.property_type(::Type{ DocumentMetadataFilter }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_DocumentMetadataFilter[name]))}
 
 function check_required(o::DocumentMetadataFilter)
diff --git a/src/generated/src/models/model_HTTPValidationError.jl b/src/generated/src/models/model_HTTPValidationError.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""HTTPValidationError
+
     HTTPValidationError(;
         detail=nothing,
     )
diff --git a/src/generated/src/models/model_LocationInner.jl b/src/generated/src/models/model_LocationInner.jl
@@ -3,7 +3,8 @@
 
 
 
-@doc raw"""
+@doc raw"""Location_inner
+
     LocationInner(; value=nothing)
 """
 mutable struct LocationInner <: OpenAPI.AnyOfAPIModel
diff --git a/src/generated/src/models/model_Query.jl b/src/generated/src/models/model_Query.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""Query
+
     Query(;
         query=nothing,
         filter=nothing,
diff --git a/src/generated/src/models/model_QueryRequest.jl b/src/generated/src/models/model_QueryRequest.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""QueryRequest
+
     QueryRequest(;
         queries=nothing,
     )
diff --git a/src/generated/src/models/model_QueryResponse.jl b/src/generated/src/models/model_QueryResponse.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""QueryResponse
+
     QueryResponse(;
         results=nothing,
     )
diff --git a/src/generated/src/models/model_QueryResult.jl b/src/generated/src/models/model_QueryResult.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""QueryResult
+
     QueryResult(;
         query=nothing,
         results=nothing,
diff --git a/src/generated/src/models/model_QueryWithEmbedding.jl b/src/generated/src/models/model_QueryWithEmbedding.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""QueryWithEmbedding
+
     QueryWithEmbedding(;
         query=nothing,
         filter=nothing,
diff --git a/src/generated/src/models/model_Source.jl b/src/generated/src/models/model_Source.jl
@@ -2,25 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""An enumeration.
-
-    Source(;
-    )
-
-"""
-Base.@kwdef mutable struct Source <: OpenAPI.APIModel
-
-    function Source()
-        return new()
-    end
-end # type Source
-
-const _property_types_Source = Dict{Symbol,String}()
-OpenAPI.property_type(::Type{ Source }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_Source[name]))}
-
-function check_required(o::Source)
-    true
-end
-
-function OpenAPI.validate_property(::Type{ Source }, name::Symbol, val)
+if !isdefined(@__MODULE__, :Source)
+    const Source = String
+else
+    @warn("Skipping redefinition of Source to String")
 end
diff --git a/src/generated/src/models/model_UpsertRequest.jl b/src/generated/src/models/model_UpsertRequest.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""UpsertRequest
+
     UpsertRequest(;
         documents=nothing,
     )
diff --git a/src/generated/src/models/model_UpsertResponse.jl b/src/generated/src/models/model_UpsertResponse.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""UpsertResponse
+
     UpsertResponse(;
         ids=nothing,
     )
diff --git a/src/generated/src/models/model_ValidationError.jl b/src/generated/src/models/model_ValidationError.jl
@@ -2,7 +2,8 @@
 # Do not modify this file directly. Modify the OpenAPI specification instead.
 
 
-@doc raw"""
+@doc raw"""ValidationError
+
     ValidationError(;
         loc=nothing,
         msg=nothing,
