_version -> VersionNumber

Author: Affie

src/DataBlobs/entities/BlobEntry.jl

@@ -41,8 +41,8 @@ Base.@kwdef struct Blobentry
     createdTimestamp::Union{ZonedDateTime, Nothing} = nothing
     """ Use carefully, but necessary to support advanced usage such as time synchronization over Blob data. """
     lastUpdatedTimestamp::Union{ZonedDateTime, Nothing} = nothing
-    """ Type version of this Blobentry. TBD.jl consider upgrading to `::VersionNumber`. """
-    _version::String = string(_getDFGVersion())
+    """ Type version of this Blobentry."""
+    _version::VersionNumber = _getDFGVersion()
 end
 
 StructTypes.StructType(::Type{Blobentry}) = StructTypes.UnorderedStruct()

src/DataBlobs/services/HelpersDataWrapEntryBlob.jl

@@ -57,7 +57,7 @@ function Blobentry(
     timestamp::ZonedDateTime = entry.timestamp,
     createdTimestamp = entry.createdTimestamp,
     lastUpdatedTimestamp = entry.lastUpdatedTimestamp,
-    _version::String = entry._version,
+    _version = entry._version,
 )
     return Blobentry(;
         id,
@@ -267,7 +267,7 @@ function updateData!(
         blobstore = getLabel(blobstore),
         hash = string(bytes2hex(hashfunction(blob))),
         origin = buildSourceString(dfg, label),
-        _version = string(_getDFGVersion()),
+        _version = _getDFGVersion(),
     )
     mergeBlobentry!(dfg, label, newEntry)
     updateBlob!(blobstore, newEntry, blob)

src/FileDFG/FileDFG.jl

@@ -1,6 +1,3 @@
 
-# Entities
-include("entities/FileDFG.jl")
-
 # Services
 include("services/FileDFG.jl")

src/FileDFG/entities/FileDFG.jl

@@ -64,7 +64,7 @@ Base.@kwdef struct FactorDFG <: AbstractDFGFactor
     solvable::Int
     data::Union{Nothing, String} = nothing #TODO v0.27 deprecate data completely, left as a bridge to old serialization structure
     metadata::String
-    _version::String = string(_getDFGVersion())
+    _version::VersionNumber = _getDFGVersion()
     state::FactorState
     observJSON::String # serialized observation
     # blobEntries::Vector{Blobentry}#TODO should factor have blob entries?
@@ -91,7 +91,7 @@ function FactorDFG(
     solvable::Int,
     data::Union{Nothing, String},
     metadata::String,
-    _version::String,
+    _version,
     state::Union{Nothing, FactorState} = nothing,
     observJSON::Union{Nothing, String} = nothing,
 )

src/entities/DFGFactor.jl

@@ -122,7 +122,7 @@ Base.@kwdef mutable struct PackedVariableState
     solvedCount::Int
     solveKey::Symbol
     covar::Vector{Float64}
-    _version::String = string(_getDFGVersion())
+    _version::VersionNumber = _getDFGVersion()
 end
 # maybe add
 # createdTimestamp::DateTime#!
@@ -158,7 +158,7 @@ Base.@kwdef struct MeanMaxPPE <: AbstractPointParametricEst
     max::Vector{Float64}
     mean::Vector{Float64}
     _type::String = "MeanMaxPPE"
-    _version::String = string(_getDFGVersion())
+    _version::VersionNumber = _getDFGVersion()
     createdTimestamp::Union{ZonedDateTime, Nothing} = nothing
     lastUpdatedTimestamp::Union{ZonedDateTime, Nothing} = nothing
 end
@@ -185,7 +185,7 @@ function MeanMaxPPE(
         max,
         mean,
         "MeanMaxPPE",
-        string(_getDFGVersion()),
+        _getDFGVersion(),
         now(tz"UTC"),
         now(tz"UTC"),
     )
@@ -223,7 +223,7 @@ Base.@kwdef struct VariableDFG <: AbstractDFGVariable
     ppes::Vector{MeanMaxPPE} = MeanMaxPPE[]
     blobEntries::Vector{Blobentry} = Blobentry[]
     variableType::String
-    _version::String = string(_getDFGVersion())
+    _version::VersionNumber = _getDFGVersion()
     metadata::String = "e30="
     solvable::Int = 1
     solverData::Vector{PackedVariableState} = PackedVariableState[]

src/entities/DFGVariable.jl

@@ -1,28 +1,11 @@
 ## Version checking
 #NOTE fixed really bad function but kept similar as fallback #TODO upgrade to use pkgversion(m::Module)
 function _getDFGVersion()
-    if VERSION >= v"1.9"
-        return pkgversion(DistributedFactorGraphs)
-    end
-    #TODO when we drop jl<1.9 remove the rest here
-    pkgorigin = get(Base.pkgorigins, Base.PkgId(DistributedFactorGraphs), nothing)
-    if !isnothing(pkgorigin) && !isnothing(pkgorigin.version)
-        return pkgorigin.version
-    end
-    dep =
-        get(Pkg.dependencies(), Base.UUID("b5cc3c7e-6572-11e9-2517-99fb8daf2f04"), nothing)
-    if !isnothing(dep)
-        return dep.version
-    else
-        # This is arguably slower, but needed for Travis.
-        return Pkg.TOML.parse(
-            read(joinpath(dirname(pathof(@__MODULE__)), "..", "Project.toml"), String),
-        )["version"] |> VersionNumber
-    end
+    return pkgversion(DistributedFactorGraphs)
 end
 
 function _versionCheck(node::Union{<:VariableDFG, <:FactorDFG})
-    if VersionNumber(node._version).minor < _getDFGVersion().minor
+    if node._version.minor < _getDFGVersion().minor
         @warn "This data was serialized using DFG $(node._version) but you have $(_getDFGVersion()) installed, there may be deserialization issues." maxlog =
             10
     end
@@ -159,7 +142,7 @@ function packVariableState(d::VariableState{T}) where {T <: VariableStateType}
         d.solvedCount,
         d.solveKey,
         isempty(d.covar) ? Float64[] : vec(d.covar[1]),
-        string(_getDFGVersion()),
+        _getDFGVersion(),
     )
 end
 
@@ -234,7 +217,7 @@ function packVariable(
         solvable = v.solvable,
         variableType = stringVariableType(DFG.getVariableType(v)),
         blobEntries = collect(values(v.dataDict)),
-        _version = string(DFG._getDFGVersion()),
+        _version = _getDFGVersion(),
     )
 end
 
@@ -312,7 +295,7 @@ function packFactor(f::FactorCompute)
         solvable = getSolvable(f),
         metadata = base64encode(JSON3.write(f.smallData)),
         # Pack the node data
-        _version = string(_getDFGVersion()),
+        _version = _getDFGVersion(),
         state = f.state,
         observJSON = JSON3.write(packObservation(f)),
     )

src/services/Serialization.jl

@@ -161,7 +161,7 @@ using UUIDs
 end
 
 ##
-# file = filter(f -> endswith(f, ".tar.gz"), readdir(joinpath(@__DIR__, "data")))[2]
+# file = filter(f -> endswith(f, ".tar.gz"), readdir(joinpath(@__DIR__, "data")))[1]
 # loadFile = joinpath(@__DIR__, "data", file)
 # fg = loadDFG(loadFile)
 ##

test/fileDFGTests.jl

@@ -1089,6 +1089,7 @@ function blobsStoresTestBlock!(fg)
     @test listBlobstores(fg) == [fs.label]
     # Getting
     @test getBlobstore(fg, fs.label) == fs
+    @test_throws LabelNotFoundError getBlobstore(fg, :notfound)
     # Deleting
     @test deleteBlobstore!(fg, fs.label) == 1
     # Updating
@@ -1100,8 +1101,18 @@ function blobsStoresTestBlock!(fg)
     # Add it back
     addBlobstore!(fg, fs)
 
-    # Data functions
+    # Blob 
     testData = rand(UInt8, 50)
+    blobId = addBlob!(fs, testData)
+    @test blobId isa UUID
+    @test_throws DFG.IdExistsError addBlob!(fs, blobId, testData)
+    @test getBlob(fs, blobId) == testData
+    @test_throws DFG.IdNotFoundError getBlob(fs, uuid4())
+    @test_throws DFG.IdNotFoundError deleteBlob!(fs, uuid4())
+    @test deleteBlob!(fs, blobId) == 1
+    @test_throws DFG.IdNotFoundError getBlob(fs, blobId)
+
+    # Data functions
     # Adding 
     newData = addData!(fg, fs.label, :a, :testing, testData) # convenience wrapper over addBlob!
     # Listing