standardized timekeeping

RageAgainstThePixel · Nov 17, 2023 · 8669e0f · 8669e0f
1 parent 6b5412e
commit 8669e0f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 21 deletions.
diff --git a/OpenAI-DotNet/Files/FileData.cs b/OpenAI-DotNet/Files/FileData.cs
@@ -34,10 +34,14 @@ public sealed class FileData : BaseResponse
         /// </summary>
         [JsonInclude]
         [JsonPropertyName("created_at")]
-        public int CreatedUnixTime { get; private set; }
+        public int CreatedAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime CreatedAt => DateTimeOffset.FromUnixTimeSeconds(CreatedUnixTime).DateTime;
+        [Obsolete("Use CreatedAtUnixTimeSeconds")]
+        public int CreatedUnixTime => CreatedAtUnixTimeSeconds;
+
+        [JsonIgnore]
+        public DateTime CreatedAt => DateTimeOffset.FromUnixTimeSeconds(CreatedAtUnixTimeSeconds).DateTime;
 
         /// <summary>
         /// The name of the file.

diff --git a/OpenAI-DotNet/FineTuning/FineTuneJob.cs b/OpenAI-DotNet/FineTuning/FineTuneJob.cs
@@ -20,17 +20,31 @@ public sealed class FineTuneJob
 
         [JsonInclude]
         [JsonPropertyName("created_at")]
-        public int? CreatedAtUnixTime { get; private set; }
+        public int? CreateAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime CreatedAt => DateTimeOffset.FromUnixTimeSeconds(CreatedAtUnixTime ?? 0).DateTime;
+        [Obsolete("Use CreateAtUnixTimeSeconds")]
+        public int? CreatedAtUnixTime => CreateAtUnixTimeSeconds;
+
+        [JsonIgnore]
+        public DateTime? CreatedAt
+            => CreateAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(CreateAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         [JsonInclude]
         [JsonPropertyName("finished_at")]
-        public int? FinishedAtUnixTime { get; private set; }
+        public int? FinishedAtUnixTimeSeconds { get; private set; }
+
+        [JsonIgnore]
+        [Obsolete("Use FinishedAtUnixTimeSeconds")]
+        public int? FinishedAtUnixTime => CreateAtUnixTimeSeconds;
 
         [JsonIgnore]
-        public DateTime FinishedAt => DateTimeOffset.FromUnixTimeSeconds(FinishedAtUnixTime ?? 0).DateTime;
+        public DateTime? FinishedAt
+            => FinishedAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(FinishedAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         [JsonInclude]
         [JsonPropertyName("fine_tuned_model")]

diff --git a/OpenAI-DotNet/Threads/RunResponse.cs b/OpenAI-DotNet/Threads/RunResponse.cs
@@ -26,16 +26,6 @@ public sealed class RunResponse : BaseResponse
         [JsonPropertyName("object")]
         public string Object { get; private set; }
 
-        /// <summary>
-        /// The Unix timestamp (in seconds) for when the thread was created.
-        /// </summary>
-        [JsonInclude]
-        [JsonPropertyName("created_at")]
-        public int CreatedAtUnixTimeSeconds { get; private set; }
-
-        [JsonIgnore]
-        public DateTime CreatedAt => DateTimeOffset.FromUnixTimeSeconds(CreatedAtUnixTimeSeconds).DateTime;
-
         /// <summary>
         /// The thread ID that this run belongs to.
         /// </summary>
@@ -74,6 +64,16 @@ public sealed class RunResponse : BaseResponse
         [JsonPropertyName("last_error")]
         public RunLastError LastError { get; private set; }
 
+        /// <summary>
+        /// The Unix timestamp (in seconds) for when the thread was created.
+        /// </summary>
+        [JsonInclude]
+        [JsonPropertyName("created_at")]
+        public int CreatedAtUnixTimeSeconds { get; private set; }
+
+        [JsonIgnore]
+        public DateTime CreatedAt => DateTimeOffset.FromUnixTimeSeconds(CreatedAtUnixTimeSeconds).DateTime;
+
         /// <summary>
         /// The Unix timestamp (in seconds) for when the run will expire.
         /// </summary>
@@ -82,7 +82,10 @@ public sealed class RunResponse : BaseResponse
         public int? ExpiresAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime ExpiresAt => DateTimeOffset.FromUnixTimeSeconds(ExpiresAtUnixTimeSeconds ?? 0).DateTime;
+        public DateTime? ExpiresAt
+            => ExpiresAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(ExpiresAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         /// <summary>
         /// The Unix timestamp (in seconds) for when the run was started.
@@ -92,7 +95,10 @@ public sealed class RunResponse : BaseResponse
         public int? StartedAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime StartedAt => DateTimeOffset.FromUnixTimeSeconds(StartedAtUnixTimeSeconds ?? 0).DateTime;
+        public DateTime? StartedAt
+            => StartedAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(StartedAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         /// <summary>
         /// The Unix timestamp (in seconds) for when the run was cancelled.
@@ -102,7 +108,10 @@ public sealed class RunResponse : BaseResponse
         public int? CancelledAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime CancelledAt => DateTimeOffset.FromUnixTimeSeconds(CancelledAtUnixTimeSeconds ?? 0).DateTime;
+        public DateTime? CancelledAt
+            => CancelledAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(CancelledAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         /// <summary>
         /// The Unix timestamp (in seconds) for when the run failed.
@@ -112,7 +121,10 @@ public sealed class RunResponse : BaseResponse
         public int? FailedAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime FailedAt => DateTimeOffset.FromUnixTimeSeconds(FailedAtUnixTimeSeconds ?? 0).DateTime;
+        public DateTime? FailedAt
+            => FailedAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(FailedAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         /// <summary>
         /// The Unix timestamp (in seconds) for when the run was completed.
@@ -122,7 +134,10 @@ public sealed class RunResponse : BaseResponse
         public int? CompletedAtUnixTimeSeconds { get; private set; }
 
         [JsonIgnore]
-        public DateTime CompletedAt => DateTimeOffset.FromUnixTimeSeconds(CompletedAtUnixTimeSeconds ?? 0).DateTime;
+        public DateTime? CompletedAt
+            => CompletedAtUnixTimeSeconds.HasValue
+                ? DateTimeOffset.FromUnixTimeSeconds(CompletedAtUnixTimeSeconds.Value).DateTime
+                : null;
 
         /// <summary>
         /// The model that the assistant used for this run.