Lower APIs from package to internal access

Author: mattt

Sources/AnyLanguageModel/Extensions/Character+Extensions.swift

@@ -1,14 +1,14 @@
 extension Character {
-    package static let jsonQuoteScalars: Set<UInt32> = [0x22, 0x201C, 0x201D, 0x2018, 0x2019]
-    package static let jsonAllowedWhitespaceCharacters: Set<Character> = [" ", "\t", "\n"]
+    static let jsonQuoteScalars: Set<UInt32> = [0x22, 0x201C, 0x201D, 0x2018, 0x2019]
+    static let jsonAllowedWhitespaceCharacters: Set<Character> = [" ", "\t", "\n"]
 
-    package var containsEmojiScalar: Bool {
+    var containsEmojiScalar: Bool {
         unicodeScalars.contains { scalar in
             scalar.properties.isEmojiPresentation || scalar.properties.isEmoji
         }
     }
 
-    package var isValidJSONStringCharacter: Bool {
+    var isValidJSONStringCharacter: Bool {
         guard self != "\\" else { return false }
         guard let scalar = unicodeScalars.first, scalar.value >= 0x20 else { return false }
         guard !Self.jsonQuoteScalars.contains(scalar.value) else { return false }

Sources/AnyLanguageModel/Extensions/JSONDecoder+Extensions.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 extension JSONDecoder.DateDecodingStrategy {
-    package static let iso8601WithFractionalSeconds = custom { decoder in
+    static let iso8601WithFractionalSeconds = custom { decoder in
         let container = try decoder.singleValueContainer()
         let string = try container.decode(String.self)
 

Sources/AnyLanguageModel/Extensions/URLSession+Extensions.swift

@@ -6,15 +6,15 @@ import JSONSchema
     import FoundationNetworking
 #endif
 
-package enum HTTP {
-    package enum Method: String {
+enum HTTP {
+    enum Method: String {
         case get = "GET"
         case post = "POST"
     }
 }
 
 extension URLSession {
-    package func fetch<T: Decodable>(
+    func fetch<T: Decodable>(
         _ method: HTTP.Method,
         url: URL,
         headers: [String: String] = [:],
@@ -57,7 +57,7 @@ extension URLSession {
         }
     }
 
-    package func fetchStream<T: Decodable & Sendable>(
+    func fetchStream<T: Decodable & Sendable>(
         _ method: HTTP.Method,
         url: URL,
         headers: [String: String] = [:],
@@ -120,7 +120,7 @@ extension URLSession {
         }
     }
 
-    package func fetchEventStream<T: Decodable & Sendable>(
+    func fetchEventStream<T: Decodable & Sendable>(
         _ method: HTTP.Method,
         url: URL,
         headers: [String: String] = [:],

Sources/AnyLanguageModel/GenerationGuide.swift

@@ -3,19 +3,19 @@ import class Foundation.NSDecimalNumber
 
 /// Guides that control how values are generated.
 public struct GenerationGuide<Value>: Sendable {
-    package var minimumCount: Int?
-    package var maximumCount: Int?
-    package var minimum: Double?
-    package var maximum: Double?
+    var minimumCount: Int?
+    var maximumCount: Int?
+    var minimum: Double?
+    var maximum: Double?
 
     public init() {}
 
-    package init(minimumCount: Int?, maximumCount: Int?) {
+    init(minimumCount: Int?, maximumCount: Int?) {
         self.minimumCount = minimumCount
         self.maximumCount = maximumCount
     }
 
-    package init(minimum: Double?, maximum: Double?) {
+    init(minimum: Double?, maximum: Double?) {
         self.minimum = minimum
         self.maximum = maximum
     }
@@ -114,19 +114,19 @@ extension GenerationGuide where Value == Float {
     ///
     /// The bounds are inclusive.
     public static func minimum(_ value: Float) -> GenerationGuide<Float> {
-        GenerationGuide<Float>()
+        GenerationGuide<Float>(minimum: Double(value), maximum: nil)
     }
 
     /// Enforces a maximum value.
     ///
     /// The bounds are inclusive.
     public static func maximum(_ value: Float) -> GenerationGuide<Float> {
-        GenerationGuide<Float>()
+        GenerationGuide<Float>(minimum: nil, maximum: Double(value))
     }
 
     /// Enforces values fall within a range.
     public static func range(_ range: ClosedRange<Float>) -> GenerationGuide<Float> {
-        GenerationGuide<Float>()
+        GenerationGuide<Float>(minimum: Double(range.lowerBound), maximum: Double(range.upperBound))
     }
 }
 
@@ -138,19 +138,22 @@ extension GenerationGuide where Value == Decimal {
     ///
     /// The bounds are inclusive.
     public static func minimum(_ value: Decimal) -> GenerationGuide<Decimal> {
-        GenerationGuide<Decimal>()
+        GenerationGuide<Decimal>(minimum: NSDecimalNumber(decimal: value).doubleValue, maximum: nil)
     }
 
     /// Enforces a maximum value.
     ///
     /// The bounds are inclusive.
     public static func maximum(_ value: Decimal) -> GenerationGuide<Decimal> {
-        GenerationGuide<Decimal>()
+        GenerationGuide<Decimal>(minimum: nil, maximum: NSDecimalNumber(decimal: value).doubleValue)
     }
 
     /// Enforces values fall within a range.
     public static func range(_ range: ClosedRange<Decimal>) -> GenerationGuide<Decimal> {
-        GenerationGuide<Decimal>()
+        GenerationGuide<Decimal>(
+            minimum: NSDecimalNumber(decimal: range.lowerBound).doubleValue,
+            maximum: NSDecimalNumber(decimal: range.upperBound).doubleValue
+        )
     }
 }
 

Sources/AnyLanguageModel/GenerationSchema.swift

@@ -871,7 +871,7 @@ extension GenerationSchema {
     /// ```
     static let omitAdditionalPropertiesKey = CodingUserInfoKey(rawValue: "GenerationSchema.omitAdditionalProperties")!
 
-    package func schemaPrompt() -> String {
+    func schemaPrompt() -> String {
         let encoder = JSONEncoder()
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
         guard let data = try? encoder.encode(self),

Sources/AnyLanguageModel/StructuredGeneration.swift

@@ -6,7 +6,7 @@ import Foundation
 ///
 /// Implementations provide tokenization, sampling, and decoding state so the
 /// generator can constrain output to valid JSON for a schema.
-package protocol TokenBackend {
+protocol TokenBackend {
     func tokenize(_ text: String) throws -> [Int]
     func tokenText(_ token: Int) -> String?
     func isSpecialToken(_ token: Int) -> Bool
@@ -23,7 +23,7 @@ package protocol TokenBackend {
 // MARK: - JSON Generator
 
 /// Generates JSON that conforms to a schema using constrained token sampling.
-package struct ConstrainedJSONGenerator<Backend: TokenBackend> {
+struct ConstrainedJSONGenerator<Backend: TokenBackend> {
     private var backend: Backend
     private let schema: GenerationSchema
     private var emittedText = ""
@@ -44,7 +44,7 @@ package struct ConstrainedJSONGenerator<Backend: TokenBackend> {
     ///   - backend: A backend that provides tokenization and sampling.
     ///   - schema: The generation schema to satisfy.
     /// - Throws: ``ConstrainedGenerationError`` when required tokens cannot be tokenized.
-    package init(backend: Backend, schema: GenerationSchema) throws {
+    init(backend: Backend, schema: GenerationSchema) throws {
         self.backend = backend
         self.schema = schema
 
@@ -71,7 +71,7 @@ package struct ConstrainedJSONGenerator<Backend: TokenBackend> {
     ///
     /// - Returns: A JSON string that satisfies the schema.
     /// - Throws: ``ConstrainedGenerationError`` if generation fails.
-    package mutating func generate() throws -> String {
+    mutating func generate() throws -> String {
         do {
             return try generateNode(schema.root)
         } catch let error as ConstrainedGenerationError {
@@ -429,7 +429,7 @@ package struct ConstrainedJSONGenerator<Backend: TokenBackend> {
 // MARK: - Errors
 
 /// An error that can occur during constrained JSON generation.
-package enum ConstrainedGenerationError: LocalizedError {
+enum ConstrainedGenerationError: LocalizedError {
     /// A required value failed to tokenize.
     case tokenizationFailed
 
@@ -467,7 +467,7 @@ package enum ConstrainedGenerationError: LocalizedError {
     /// An any-of schema has no choices.
     case emptyAnyOf
 
-    package var errorDescription: String? {
+    var errorDescription: String? {
         switch self {
         case .tokenizationFailed:
             return "Failed to tokenize a required value"